qontract-reconcile 0.10.2.dev156__py3-none-any.whl → 0.10.2.dev158__py3-none-any.whl
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- {qontract_reconcile-0.10.2.dev156.dist-info → qontract_reconcile-0.10.2.dev158.dist-info}/METADATA +1 -1
- {qontract_reconcile-0.10.2.dev156.dist-info → qontract_reconcile-0.10.2.dev158.dist-info}/RECORD +9 -9
- reconcile/external_resources/model.py +2 -0
- reconcile/gql_definitions/external_resources/external_resources_namespaces.py +9 -1
- reconcile/gql_definitions/introspection.json +95 -7
- reconcile/gql_definitions/quay_membership/quay_membership.py +8 -0
- reconcile/quay_membership.py +7 -2
- {qontract_reconcile-0.10.2.dev156.dist-info → qontract_reconcile-0.10.2.dev158.dist-info}/WHEEL +0 -0
- {qontract_reconcile-0.10.2.dev156.dist-info → qontract_reconcile-0.10.2.dev158.dist-info}/entry_points.txt +0 -0
{qontract_reconcile-0.10.2.dev156.dist-info → qontract_reconcile-0.10.2.dev158.dist-info}/METADATA
RENAMED
@@ -1,6 +1,6 @@
|
|
1
1
|
Metadata-Version: 2.4
|
2
2
|
Name: qontract-reconcile
|
3
|
-
Version: 0.10.2.
|
3
|
+
Version: 0.10.2.dev158
|
4
4
|
Summary: Collection of tools to reconcile services with their desired state as defined in the app-interface DB.
|
5
5
|
Project-URL: homepage, https://github.com/app-sre/qontract-reconcile
|
6
6
|
Project-URL: repository, https://github.com/app-sre/qontract-reconcile
|
{qontract_reconcile-0.10.2.dev156.dist-info → qontract_reconcile-0.10.2.dev158.dist-info}/RECORD
RENAMED
@@ -89,7 +89,7 @@ reconcile/openshift_upgrade_watcher.py,sha256=9IB321hlRZZhzdaR9G3zoWAhVv0-KzNiEq
|
|
89
89
|
reconcile/openshift_users.py,sha256=JUWLb13USlQ4KvXZVsi3JES4csZnXlH0plhxskg_p6A,5300
|
90
90
|
reconcile/openshift_vault_secrets.py,sha256=9rTqV6wzCQx2Oh712E_Xj8wMG7u8Oh-pY8DWjlv4mZw,1660
|
91
91
|
reconcile/quay_base.py,sha256=h5xNjb7EZm8L2JgpO42r6w0UA4im5dabZXJSIW69zKU,1987
|
92
|
-
reconcile/quay_membership.py,sha256=
|
92
|
+
reconcile/quay_membership.py,sha256=cmeoRdr3-wVlymNHVhzhW0W-Tq6qt1hd2OOIhGXsmrY,6398
|
93
93
|
reconcile/quay_mirror.py,sha256=0KtQFwrvMNtlsPJ9F_-ICaVIjgIUjFxqipvAPcvyg3Q,15338
|
94
94
|
reconcile/quay_mirror_org.py,sha256=tXKuF6JtmaNRwu8_g_65U_Vpd6sFBYeXmJA-flVhylE,10764
|
95
95
|
reconcile/quay_permissions.py,sha256=9KOutS1w4RFQqkvMSy54VtsKNx56-phzP6yI_rEW-B8,4244
|
@@ -205,7 +205,7 @@ reconcile/external_resources/integration_secrets_sync.py,sha256=M2uOFi2JXWhiw3hQ
|
|
205
205
|
reconcile/external_resources/manager.py,sha256=bnGLeQmg7wzTcApgNTDKBTsojuEgOrCYX1QIIS12-ns,18247
|
206
206
|
reconcile/external_resources/meta.py,sha256=noaytFzmShpzLA_ebGh7wuP45mOfHIOnnoUxivjDa1I,672
|
207
207
|
reconcile/external_resources/metrics.py,sha256=KiBjMUaN_z0cSkF_7Ar_a8RiuiwVqjyMcVdISlxhzXE,3898
|
208
|
-
reconcile/external_resources/model.py,sha256=
|
208
|
+
reconcile/external_resources/model.py,sha256=DDMdk608rsQYfdaYZr77YZLBKW9qgtSLLyVa_FzL5vw,13964
|
209
209
|
reconcile/external_resources/reconciler.py,sha256=wB8cB5pmqDJ1_t5_Aly4mrULGnI3OQaKqUZCB_Z9RWw,9573
|
210
210
|
reconcile/external_resources/secrets_sync.py,sha256=ZDxzGZ6wC4zxLhA7-L39xDRH6rzUM285gytuzmRQdlw,16208
|
211
211
|
reconcile/external_resources/state.py,sha256=Hyc3hszY1NFWg3t9QSXL2F5bRs0vP2FNDWzTGrHJsmE,13387
|
@@ -227,7 +227,7 @@ reconcile/glitchtip_project_alerts/integration.py,sha256=BgMx-NyV9mTuv7Sotb2OioC
|
|
227
227
|
reconcile/glitchtip_project_dsn/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
|
228
228
|
reconcile/glitchtip_project_dsn/integration.py,sha256=2iugub-kHYkHNK33n0v9_TeWonuxCPah_VkoTPvaajE,8077
|
229
229
|
reconcile/gql_definitions/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
|
230
|
-
reconcile/gql_definitions/introspection.json,sha256=
|
230
|
+
reconcile/gql_definitions/introspection.json,sha256=myUuHC_BLY3xZ0nDjnaQsvYFNM5eTiE3bWgNgM3e5iI,2290863
|
231
231
|
reconcile/gql_definitions/acs/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
|
232
232
|
reconcile/gql_definitions/acs/acs_instances.py,sha256=L91WW9LbhJbBSrECqShQpFtjoBOsmNIYLRpMbx1io5o,2181
|
233
233
|
reconcile/gql_definitions/acs/acs_policies.py,sha256=bN5i4mks10Z23KJSj7jqp966Osq2dps4d-sPH9gjxEA,7008
|
@@ -318,7 +318,7 @@ reconcile/gql_definitions/endpoints_discovery/apps.py,sha256=aBWRAwDUJQ32ghJS4cP
|
|
318
318
|
reconcile/gql_definitions/external_resources/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
|
319
319
|
reconcile/gql_definitions/external_resources/aws_accounts.py,sha256=XR69j9dpTQ0gv8y-AZN7AJ0dPvO-wbHscyCDgrax6Bk,2046
|
320
320
|
reconcile/gql_definitions/external_resources/external_resources_modules.py,sha256=JViHtDWEBwjStBUo_bUdm_sxdpjCHcoATeFvwFRLQpU,3009
|
321
|
-
reconcile/gql_definitions/external_resources/external_resources_namespaces.py,sha256=
|
321
|
+
reconcile/gql_definitions/external_resources/external_resources_namespaces.py,sha256=vYxUBSx3r9EZI7TCfSTlxKEFKYEUuKxbqTOAlizxApY,45138
|
322
322
|
reconcile/gql_definitions/external_resources/external_resources_settings.py,sha256=WBkJqnoyYCe1Vimwbp_Pa0RdyTdmWNf6oEWyA749QzA,3589
|
323
323
|
reconcile/gql_definitions/external_resources/fragments/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
|
324
324
|
reconcile/gql_definitions/external_resources/fragments/external_resources_module_overrides.py,sha256=T_qWCRtzU8F9frebBXG9TkeQdrKGt3R9YinSngPoFqM,1262
|
@@ -392,7 +392,7 @@ reconcile/gql_definitions/openshift_groups/managed_roles.py,sha256=rsHMgDWwnh0RR
|
|
392
392
|
reconcile/gql_definitions/openshift_serviceaccount_tokens/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
|
393
393
|
reconcile/gql_definitions/openshift_serviceaccount_tokens/tokens.py,sha256=FeraeQThHl2UbhTuCPDwm3ltczF_jfZn5E3Squ8-znw,3313
|
394
394
|
reconcile/gql_definitions/quay_membership/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
|
395
|
-
reconcile/gql_definitions/quay_membership/quay_membership.py,sha256=
|
395
|
+
reconcile/gql_definitions/quay_membership/quay_membership.py,sha256=MKBkrE-1YYelaAAxOdpqUwCo45kOVC8q29vXArqK_zM,3075
|
396
396
|
reconcile/gql_definitions/rhidp/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
|
397
397
|
reconcile/gql_definitions/rhidp/organizations.py,sha256=dW9y3ewFu3E-DFrZAi_SEewHYR0MWYeOB52vwnVcq5E,2580
|
398
398
|
reconcile/gql_definitions/service_dependencies/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
|
@@ -797,7 +797,7 @@ tools/saas_promotion_state/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJ
|
|
797
797
|
tools/saas_promotion_state/saas_promotion_state.py,sha256=UfwwRLS5Ya4_Nh1w5n1dvoYtchQvYE9yj1VANt2IKqI,3925
|
798
798
|
tools/sre_checkpoints/__init__.py,sha256=CDaDaywJnmRCLyl_NCcvxi-Zc0hTi_3OdwKiFOyS39I,145
|
799
799
|
tools/sre_checkpoints/util.py,sha256=zEDbGr18ZeHNQwW8pUsr2JRjuXIPz--WAGJxZo9sv_Y,894
|
800
|
-
qontract_reconcile-0.10.2.
|
801
|
-
qontract_reconcile-0.10.2.
|
802
|
-
qontract_reconcile-0.10.2.
|
803
|
-
qontract_reconcile-0.10.2.
|
800
|
+
qontract_reconcile-0.10.2.dev158.dist-info/METADATA,sha256=1ciBYBdru8TmnRdRAo-CQuWYci-EUZzdVv3aygjMl2s,24627
|
801
|
+
qontract_reconcile-0.10.2.dev158.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
|
802
|
+
qontract_reconcile-0.10.2.dev158.dist-info/entry_points.txt,sha256=5i9l54La3vQrDLAdwDKQWC0iG4sV9RRfOb1BpvzOWLc,698
|
803
|
+
qontract_reconcile-0.10.2.dev158.dist-info/RECORD,,
|
@@ -19,6 +19,7 @@ from reconcile.gql_definitions.external_resources.external_resources_modules imp
|
|
19
19
|
)
|
20
20
|
from reconcile.gql_definitions.external_resources.external_resources_namespaces import (
|
21
21
|
NamespaceTerraformProviderResourceAWSV1,
|
22
|
+
NamespaceTerraformResourceCloudWatchV1,
|
22
23
|
NamespaceTerraformResourceElastiCacheV1,
|
23
24
|
NamespaceTerraformResourceKMSV1,
|
24
25
|
NamespaceTerraformResourceMskV1,
|
@@ -98,6 +99,7 @@ SUPPORTED_RESOURCE_TYPES = (
|
|
98
99
|
| NamespaceTerraformResourceMskV1
|
99
100
|
| NamespaceTerraformResourceElastiCacheV1
|
100
101
|
| NamespaceTerraformResourceKMSV1
|
102
|
+
| NamespaceTerraformResourceCloudWatchV1
|
101
103
|
)
|
102
104
|
|
103
105
|
|
@@ -292,6 +292,11 @@ query ExternalResourcesNamespaces {
|
|
292
292
|
defaults
|
293
293
|
es_identifier
|
294
294
|
filter_pattern
|
295
|
+
managed_by_erv2
|
296
|
+
delete
|
297
|
+
module_overrides {
|
298
|
+
... ExternalResourcesModuleOverrides
|
299
|
+
}
|
295
300
|
output_resource_name
|
296
301
|
annotations
|
297
302
|
}
|
@@ -802,6 +807,9 @@ class NamespaceTerraformResourceCloudWatchV1(NamespaceTerraformResourceAWSV1):
|
|
802
807
|
defaults: str = Field(..., alias="defaults")
|
803
808
|
es_identifier: Optional[str] = Field(..., alias="es_identifier")
|
804
809
|
filter_pattern: Optional[str] = Field(..., alias="filter_pattern")
|
810
|
+
managed_by_erv2: Optional[bool] = Field(..., alias="managed_by_erv2")
|
811
|
+
delete: Optional[bool] = Field(..., alias="delete")
|
812
|
+
module_overrides: Optional[ExternalResourcesModuleOverrides] = Field(..., alias="module_overrides")
|
805
813
|
output_resource_name: Optional[str] = Field(..., alias="output_resource_name")
|
806
814
|
annotations: Optional[str] = Field(..., alias="annotations")
|
807
815
|
|
@@ -1071,7 +1079,7 @@ class NamespaceTerraformResourceMskV1(NamespaceTerraformResourceAWSV1):
|
|
1071
1079
|
|
1072
1080
|
class NamespaceTerraformProviderResourceAWSV1(NamespaceExternalResourceV1):
|
1073
1081
|
provisioner: AWSAccountV1 = Field(..., alias="provisioner")
|
1074
|
-
resources: list[Union[NamespaceTerraformResourceRDSV1, NamespaceTerraformResourceRosaAuthenticatorV1, NamespaceTerraformResourceALBV1, NamespaceTerraformResourceS3V1, NamespaceTerraformResourceElastiCacheV1, NamespaceTerraformResourceASGV1, NamespaceTerraformResourceRoleV1, NamespaceTerraformResourceKMSV1, NamespaceTerraformResourceMskV1, NamespaceTerraformResourceSNSTopicV1, NamespaceTerraformResourceServiceAccountV1, NamespaceTerraformResourceS3SQSV1,
|
1082
|
+
resources: list[Union[NamespaceTerraformResourceRDSV1, NamespaceTerraformResourceRosaAuthenticatorV1, NamespaceTerraformResourceALBV1, NamespaceTerraformResourceS3V1, NamespaceTerraformResourceElastiCacheV1, NamespaceTerraformResourceCloudWatchV1, NamespaceTerraformResourceASGV1, NamespaceTerraformResourceRoleV1, NamespaceTerraformResourceKMSV1, NamespaceTerraformResourceMskV1, NamespaceTerraformResourceSNSTopicV1, NamespaceTerraformResourceServiceAccountV1, NamespaceTerraformResourceS3SQSV1, NamespaceTerraformResourceRosaAuthenticatorVPCEV1, NamespaceTerraformResourceS3CloudFrontV1, NamespaceTerraformResourceElasticSearchV1, NamespaceTerraformResourceACMV1, NamespaceTerraformResourceKinesisV1, NamespaceTerraformResourceRoute53ZoneV1, NamespaceTerraformResourceSQSV1, NamespaceTerraformResourceDynamoDBV1, NamespaceTerraformResourceECRV1, NamespaceTerraformResourceS3CloudFrontPublicKeyV1, NamespaceTerraformResourceSecretsManagerV1, NamespaceTerraformResourceSecretsManagerServiceAccountV1, NamespaceTerraformResourceAWSV1]] = Field(..., alias="resources")
|
1075
1083
|
|
1076
1084
|
|
1077
1085
|
class EnvironmentV1(ConfiguredBaseModel):
|
@@ -11541,6 +11541,30 @@
|
|
11541
11541
|
},
|
11542
11542
|
"isDeprecated": false,
|
11543
11543
|
"deprecationReason": null
|
11544
|
+
},
|
11545
|
+
{
|
11546
|
+
"name": "external_users",
|
11547
|
+
"description": null,
|
11548
|
+
"args": [],
|
11549
|
+
"type": {
|
11550
|
+
"kind": "NON_NULL",
|
11551
|
+
"name": null,
|
11552
|
+
"ofType": {
|
11553
|
+
"kind": "LIST",
|
11554
|
+
"name": null,
|
11555
|
+
"ofType": {
|
11556
|
+
"kind": "NON_NULL",
|
11557
|
+
"name": null,
|
11558
|
+
"ofType": {
|
11559
|
+
"kind": "OBJECT",
|
11560
|
+
"name": "ExternalUser_v1",
|
11561
|
+
"ofType": null
|
11562
|
+
}
|
11563
|
+
}
|
11564
|
+
}
|
11565
|
+
},
|
11566
|
+
"isDeprecated": false,
|
11567
|
+
"deprecationReason": null
|
11544
11568
|
}
|
11545
11569
|
],
|
11546
11570
|
"inputFields": null,
|
@@ -27145,13 +27169,21 @@
|
|
27145
27169
|
"description": null,
|
27146
27170
|
"args": [],
|
27147
27171
|
"type": {
|
27148
|
-
"kind": "
|
27149
|
-
"name":
|
27150
|
-
"ofType":
|
27151
|
-
|
27152
|
-
|
27153
|
-
|
27154
|
-
|
27172
|
+
"kind": "SCALAR",
|
27173
|
+
"name": "String",
|
27174
|
+
"ofType": null
|
27175
|
+
},
|
27176
|
+
"isDeprecated": false,
|
27177
|
+
"deprecationReason": null
|
27178
|
+
},
|
27179
|
+
{
|
27180
|
+
"name": "quay_username",
|
27181
|
+
"description": null,
|
27182
|
+
"args": [],
|
27183
|
+
"type": {
|
27184
|
+
"kind": "SCALAR",
|
27185
|
+
"name": "String",
|
27186
|
+
"ofType": null
|
27155
27187
|
},
|
27156
27188
|
"isDeprecated": false,
|
27157
27189
|
"deprecationReason": null
|
@@ -27179,6 +27211,26 @@
|
|
27179
27211
|
},
|
27180
27212
|
"isDeprecated": false,
|
27181
27213
|
"deprecationReason": null
|
27214
|
+
},
|
27215
|
+
{
|
27216
|
+
"name": "roles",
|
27217
|
+
"description": null,
|
27218
|
+
"args": [],
|
27219
|
+
"type": {
|
27220
|
+
"kind": "LIST",
|
27221
|
+
"name": null,
|
27222
|
+
"ofType": {
|
27223
|
+
"kind": "NON_NULL",
|
27224
|
+
"name": null,
|
27225
|
+
"ofType": {
|
27226
|
+
"kind": "OBJECT",
|
27227
|
+
"name": "Role_v1",
|
27228
|
+
"ofType": null
|
27229
|
+
}
|
27230
|
+
}
|
27231
|
+
},
|
27232
|
+
"isDeprecated": false,
|
27233
|
+
"deprecationReason": null
|
27182
27234
|
}
|
27183
27235
|
],
|
27184
27236
|
"inputFields": null,
|
@@ -46534,6 +46586,42 @@
|
|
46534
46586
|
},
|
46535
46587
|
"isDeprecated": false,
|
46536
46588
|
"deprecationReason": null
|
46589
|
+
},
|
46590
|
+
{
|
46591
|
+
"name": "managed_by_erv2",
|
46592
|
+
"description": null,
|
46593
|
+
"args": [],
|
46594
|
+
"type": {
|
46595
|
+
"kind": "SCALAR",
|
46596
|
+
"name": "Boolean",
|
46597
|
+
"ofType": null
|
46598
|
+
},
|
46599
|
+
"isDeprecated": false,
|
46600
|
+
"deprecationReason": null
|
46601
|
+
},
|
46602
|
+
{
|
46603
|
+
"name": "delete",
|
46604
|
+
"description": null,
|
46605
|
+
"args": [],
|
46606
|
+
"type": {
|
46607
|
+
"kind": "SCALAR",
|
46608
|
+
"name": "Boolean",
|
46609
|
+
"ofType": null
|
46610
|
+
},
|
46611
|
+
"isDeprecated": false,
|
46612
|
+
"deprecationReason": null
|
46613
|
+
},
|
46614
|
+
{
|
46615
|
+
"name": "module_overrides",
|
46616
|
+
"description": null,
|
46617
|
+
"args": [],
|
46618
|
+
"type": {
|
46619
|
+
"kind": "OBJECT",
|
46620
|
+
"name": "ExternalResourcesModuleOverrides_v1",
|
46621
|
+
"ofType": null
|
46622
|
+
},
|
46623
|
+
"isDeprecated": false,
|
46624
|
+
"deprecationReason": null
|
46537
46625
|
}
|
46538
46626
|
],
|
46539
46627
|
"inputFields": null,
|
@@ -37,6 +37,9 @@ query QuayMembership {
|
|
37
37
|
bots {
|
38
38
|
quay_username
|
39
39
|
}
|
40
|
+
external_users {
|
41
|
+
quay_username
|
42
|
+
}
|
40
43
|
expirationDate
|
41
44
|
}
|
42
45
|
}
|
@@ -72,9 +75,14 @@ class BotV1(ConfiguredBaseModel):
|
|
72
75
|
quay_username: Optional[str] = Field(..., alias="quay_username")
|
73
76
|
|
74
77
|
|
78
|
+
class ExternalUserV1(ConfiguredBaseModel):
|
79
|
+
quay_username: Optional[str] = Field(..., alias="quay_username")
|
80
|
+
|
81
|
+
|
75
82
|
class RoleV1(ConfiguredBaseModel):
|
76
83
|
users: list[UserV1] = Field(..., alias="users")
|
77
84
|
bots: list[BotV1] = Field(..., alias="bots")
|
85
|
+
external_users: list[ExternalUserV1] = Field(..., alias="external_users")
|
78
86
|
expiration_date: Optional[str] = Field(..., alias="expirationDate")
|
79
87
|
|
80
88
|
|
reconcile/quay_membership.py
CHANGED
@@ -5,6 +5,7 @@ from collections.abc import Sequence
|
|
5
5
|
from reconcile.gql_definitions.quay_membership import quay_membership
|
6
6
|
from reconcile.gql_definitions.quay_membership.quay_membership import (
|
7
7
|
BotV1,
|
8
|
+
ExternalUserV1,
|
8
9
|
PermissionQuayOrgTeamV1,
|
9
10
|
UserV1,
|
10
11
|
)
|
@@ -80,7 +81,7 @@ def fetch_current_state(quay_api_store):
|
|
80
81
|
return state
|
81
82
|
|
82
83
|
|
83
|
-
def get_usernames(users: Sequence[UserV1 | BotV1]) -> list[str]:
|
84
|
+
def get_usernames(users: Sequence[UserV1 | BotV1 | ExternalUserV1]) -> list[str]:
|
84
85
|
return [u.quay_username for u in users if u.quay_username]
|
85
86
|
|
86
87
|
|
@@ -92,7 +93,11 @@ def fetch_desired_state():
|
|
92
93
|
p = process_permission(permission)
|
93
94
|
members: list[str] = []
|
94
95
|
for role in expiration.filter(permission.roles):
|
95
|
-
members +=
|
96
|
+
members += (
|
97
|
+
get_usernames(role.users)
|
98
|
+
+ get_usernames(role.bots)
|
99
|
+
+ get_usernames(role.external_users)
|
100
|
+
)
|
96
101
|
|
97
102
|
state.add(p, members)
|
98
103
|
|
{qontract_reconcile-0.10.2.dev156.dist-info → qontract_reconcile-0.10.2.dev158.dist-info}/WHEEL
RENAMED
File without changes
|
File without changes
|