qontract-reconcile 0.10.1rc898__py3-none-any.whl → 0.10.1rc900__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.1rc898.dist-info → qontract_reconcile-0.10.1rc900.dist-info}/METADATA +1 -1
- {qontract_reconcile-0.10.1rc898.dist-info → qontract_reconcile-0.10.1rc900.dist-info}/RECORD +8 -8
- reconcile/aws_account_manager/integration.py +6 -7
- reconcile/gql_definitions/aws_account_manager/aws_accounts.py +2 -0
- reconcile/utils/jira_client.py +9 -2
- {qontract_reconcile-0.10.1rc898.dist-info → qontract_reconcile-0.10.1rc900.dist-info}/WHEEL +0 -0
- {qontract_reconcile-0.10.1rc898.dist-info → qontract_reconcile-0.10.1rc900.dist-info}/entry_points.txt +0 -0
- {qontract_reconcile-0.10.1rc898.dist-info → qontract_reconcile-0.10.1rc900.dist-info}/top_level.txt +0 -0
{qontract_reconcile-0.10.1rc898.dist-info → qontract_reconcile-0.10.1rc900.dist-info}/METADATA
RENAMED
@@ -1,6 +1,6 @@
|
|
1
1
|
Metadata-Version: 2.1
|
2
2
|
Name: qontract-reconcile
|
3
|
-
Version: 0.10.
|
3
|
+
Version: 0.10.1rc900
|
4
4
|
Summary: Collection of tools to reconcile services with their desired state as defined in the app-interface DB.
|
5
5
|
Home-page: https://github.com/app-sre/qontract-reconcile
|
6
6
|
Author: Red Hat App-SRE Team
|
{qontract_reconcile-0.10.1rc898.dist-info → qontract_reconcile-0.10.1rc900.dist-info}/RECORD
RENAMED
@@ -138,7 +138,7 @@ reconcile/aus/version_gates/ingress_gate_handler.py,sha256=ZCtyggBzzcb0prtdbMpJs
|
|
138
138
|
reconcile/aus/version_gates/ocp_gate_handler.py,sha256=RW1ppDaCZXVegV9AzzqYXxDUu_Z_7d43Z5h2Pk_piKc,716
|
139
139
|
reconcile/aus/version_gates/sts_version_gate_handler.py,sha256=swwwz0YyvrEBf_InqrRRBCt2QzHYNvvq8jz9aYwElh4,3663
|
140
140
|
reconcile/aws_account_manager/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
|
141
|
-
reconcile/aws_account_manager/integration.py,sha256=
|
141
|
+
reconcile/aws_account_manager/integration.py,sha256=tdIXqHyd0QLZOX_7_jyU7eEil-jYJbAv4I4V1c3KhVk,14981
|
142
142
|
reconcile/aws_account_manager/merge_request_manager.py,sha256=zZct3NxWMBQupl4QfD7ULxnt4ipt_2FBoH_NusboIuw,3781
|
143
143
|
reconcile/aws_account_manager/metrics.py,sha256=YB10ea4kIGwJfs5N14RF-RoXPb-QQWaDBz1jLZ3YWE0,917
|
144
144
|
reconcile/aws_account_manager/reconciler.py,sha256=5YG7nZ4GG1SY2Pe_OxetdtzOnl37MllZMu_ca22vRSo,15025
|
@@ -213,7 +213,7 @@ reconcile/gql_definitions/advanced_upgrade_service/aus_organization.py,sha256=zU
|
|
213
213
|
reconcile/gql_definitions/app_interface_metrics_exporter/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
|
214
214
|
reconcile/gql_definitions/app_interface_metrics_exporter/onboarding_status.py,sha256=uVEEqU6YYmKsNTo6EWlFnoVmqha2rvBDx-wiD64VmG0,1679
|
215
215
|
reconcile/gql_definitions/aws_account_manager/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
|
216
|
-
reconcile/gql_definitions/aws_account_manager/aws_accounts.py,sha256=
|
216
|
+
reconcile/gql_definitions/aws_account_manager/aws_accounts.py,sha256=GVRRBlj_OOw3rh-IQFsMs0WYDNy2gA4xdUciO7NJlDo,4777
|
217
217
|
reconcile/gql_definitions/aws_ami_cleanup/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
|
218
218
|
reconcile/gql_definitions/aws_ami_cleanup/asg_namespaces.py,sha256=OJmeTu7uirLGAysZ3IQTtRXqMyL8noi_QZxPuWYxxmI,3678
|
219
219
|
reconcile/gql_definitions/aws_saml_idp/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
|
@@ -666,7 +666,7 @@ reconcile/utils/helpers.py,sha256=k9svgFFZG7H5FvHYY0g5jJyvgvh2UDZxf0Ib221teag,11
|
|
666
666
|
reconcile/utils/imap_client.py,sha256=PMsX8UjJ2F59fXbbqREjLVdapYWznYTB8svFmpt39qA,1949
|
667
667
|
reconcile/utils/instrumented_wrappers.py,sha256=eVwMoa6FCrYxLv3RML3WpZF9qKVfCTjMxphgVXG03OM,1073
|
668
668
|
reconcile/utils/jenkins_api.py,sha256=RaKuZmO7_lbI-hE6c_Pq2a6CQdmBVj7BcP2jR68cIbI,7081
|
669
|
-
reconcile/utils/jira_client.py,sha256=
|
669
|
+
reconcile/utils/jira_client.py,sha256=VdWJfI9VAK2ZtYHmvuqL635t0S5eYtmBY6zR8R-qr-s,7775
|
670
670
|
reconcile/utils/jjb_client.py,sha256=crbNkZocYTPBTEindscfLjaI7pi-91Tn7HVhkE6tF9E,14424
|
671
671
|
reconcile/utils/jsonpath.py,sha256=wdxOMqR-GMpQf5vRPWRMqAF7bCiXDBkkcFfY2U4j_tk,5536
|
672
672
|
reconcile/utils/jump_host.py,sha256=W3w0S-Qa-VLK5JGg-G4f2a4_5GA34KZVV3XNAaI53Y4,5148
|
@@ -844,8 +844,8 @@ tools/test/test_qontract_cli.py,sha256=_D61RFGAN5x44CY1tYbouhlGXXABwYfxKSWSQx3Jr
|
|
844
844
|
tools/test/test_saas_promotion_state.py,sha256=dy4kkSSAQ7bC0Xp2CociETGN-2aABEfL6FU5D9Jl00Y,6056
|
845
845
|
tools/test/test_sd_app_sre_alert_report.py,sha256=v363r9zM7__0kR5K6mvJoGFcM9BvE33fWAayrqkpojA,2116
|
846
846
|
tools/test/test_sre_checkpoints.py,sha256=SKqPPTl9ua0RFdSSofnoQX-JZE6dFLO3LRhfQzqtfh8,2607
|
847
|
-
qontract_reconcile-0.10.
|
848
|
-
qontract_reconcile-0.10.
|
849
|
-
qontract_reconcile-0.10.
|
850
|
-
qontract_reconcile-0.10.
|
851
|
-
qontract_reconcile-0.10.
|
847
|
+
qontract_reconcile-0.10.1rc900.dist-info/METADATA,sha256=SoW0nnbOZ_8OcmOORa7MDS0ADopOm48NgSuuxPlINHk,2273
|
848
|
+
qontract_reconcile-0.10.1rc900.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
|
849
|
+
qontract_reconcile-0.10.1rc900.dist-info/entry_points.txt,sha256=GKQqCl2j2X1BJQ69een6rHcR26PmnxnONLNOQB-nRjY,491
|
850
|
+
qontract_reconcile-0.10.1rc900.dist-info/top_level.txt,sha256=l5ISPoXzt0SdR4jVdkfa7RPSKNc8zAHYWAnR-Dw8Ey8,24
|
851
|
+
qontract_reconcile-0.10.1rc900.dist-info/RECORD,,
|
@@ -159,13 +159,12 @@ class AwsAccountMgmtIntegration(
|
|
159
159
|
) -> None:
|
160
160
|
"""Create new AWS accounts."""
|
161
161
|
for account_request in account_requests:
|
162
|
-
|
163
|
-
|
164
|
-
|
165
|
-
|
166
|
-
|
167
|
-
|
168
|
-
):
|
162
|
+
uid = account_request.uid or reconciler.create_organization_account(
|
163
|
+
aws_api=aws_api,
|
164
|
+
name=account_request.name,
|
165
|
+
email=account_request.account_owner.email,
|
166
|
+
)
|
167
|
+
if not uid:
|
169
168
|
continue
|
170
169
|
|
171
170
|
with aws_api.assume_role(
|
@@ -88,6 +88,7 @@ query AWSAccountManagerAccounts {
|
|
88
88
|
}
|
89
89
|
resourcesDefaultRegion
|
90
90
|
supportedDeploymentRegions
|
91
|
+
uid
|
91
92
|
}
|
92
93
|
organization_accounts {
|
93
94
|
... AWSAccountManaged
|
@@ -139,6 +140,7 @@ class AWSAccountRequestV1(ConfiguredBaseModel):
|
|
139
140
|
quota_limits: Optional[list[AWSQuotaLimitsV1]] = Field(..., alias="quotaLimits")
|
140
141
|
resources_default_region: str = Field(..., alias="resourcesDefaultRegion")
|
141
142
|
supported_deployment_regions: Optional[list[str]] = Field(..., alias="supportedDeploymentRegions")
|
143
|
+
uid: Optional[str] = Field(..., alias="uid")
|
142
144
|
|
143
145
|
|
144
146
|
class AWSAccountV1(AWSAccountManaged):
|
reconcile/utils/jira_client.py
CHANGED
@@ -105,7 +105,10 @@ class JiraClient:
|
|
105
105
|
raise RuntimeError("JiraClient.server is not set.")
|
106
106
|
|
107
107
|
self.jira = JIRA(
|
108
|
-
self.server,
|
108
|
+
self.server,
|
109
|
+
token_auth=token_auth,
|
110
|
+
timeout=(read_timeout, connect_timeout),
|
111
|
+
logging=False,
|
109
112
|
)
|
110
113
|
|
111
114
|
@staticmethod
|
@@ -121,7 +124,10 @@ class JiraClient:
|
|
121
124
|
read_timeout = jira_watcher_settings.read_timeout
|
122
125
|
connect_timeout = jira_watcher_settings.connect_timeout
|
123
126
|
jira_api = JIRA(
|
124
|
-
server=server_url,
|
127
|
+
server=server_url,
|
128
|
+
token_auth=token,
|
129
|
+
timeout=(read_timeout, connect_timeout),
|
130
|
+
logging=False,
|
125
131
|
)
|
126
132
|
return JiraClient(
|
127
133
|
jira_api=jira_api,
|
@@ -228,6 +234,7 @@ class JiraClient:
|
|
228
234
|
JiraClient.DEFAULT_READ_TIMEOUT,
|
229
235
|
JiraClient.DEFAULT_CONNECT_TIMEOUT,
|
230
236
|
),
|
237
|
+
logging=False,
|
231
238
|
)
|
232
239
|
return [project.key for project in jira_api_anon.projects()]
|
233
240
|
|
File without changes
|
File without changes
|
{qontract_reconcile-0.10.1rc898.dist-info → qontract_reconcile-0.10.1rc900.dist-info}/top_level.txt
RENAMED
File without changes
|