Skip to content

APPSRE-11637 ERv2 SQS module #5241

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
fishi0x01 wants to merge 1 commit into
base: master
Choose a base branch
from
Draft

APPSRE-11637 ERv2 SQS module #5241

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 16 additions & 0 deletions reconcile/external_resources/aws.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -319,3 +319,19 @@ def validate(
raise ValueError(
f"MSK user '{user}' secret must contain only 'username' and 'password' keys!"
)


class AWSSQSFactory(AWSDefaultResourceFactory):
def resolve(
self,
spec: ExternalResourceSpec,
module_conf: ExternalResourceModuleConfiguration,
) -> dict[str, Any]:
rvr = ResourceValueResolver(spec=spec, identifier_as_value=True)
data = rvr.resolve()
all_queues = {
queue.pop("key"): queue | {"defaults": spec.get("defaults")}
for spec in data.get("specs", [])
for queue in spec.pop("queues")
}
return {"identifier": data["identifier"], "queues": all_queues}
2 changes: 2 additions & 0 deletions reconcile/external_resources/factories.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
AWSMskFactory,
AWSRdsFactory,
AWSResourceFactory,
AWSSQSFactory,
)
from reconcile.external_resources.meta import QONTRACT_INTEGRATION
from reconcile.external_resources.model import (
Expand Down Expand Up @@ -102,6 +103,7 @@ def setup_aws_resource_factories(
"elasticache": AWSElasticacheFactory(er_inventory, secret_reader),
"rds": AWSRdsFactory(er_inventory, secret_reader),
"msk": AWSMskFactory(er_inventory, secret_reader),
"sqs": AWSSQSFactory(er_inventory, secret_reader),
},
default_factory=AWSDefaultResourceFactory(er_inventory, secret_reader),
)
Expand Down
2 changes: 2 additions & 0 deletions reconcile/external_resources/model.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@
NamespaceTerraformResourceKMSV1,
NamespaceTerraformResourceMskV1,
NamespaceTerraformResourceRDSV1,
NamespaceTerraformResourceSQSV1,
NamespaceV1,
)
from reconcile.gql_definitions.external_resources.external_resources_settings import (
Expand Down Expand Up @@ -102,6 +103,7 @@ def state_path(self) -> str:
| NamespaceTerraformResourceElastiCacheV1
| NamespaceTerraformResourceKMSV1
| NamespaceTerraformResourceCloudWatchV1
| NamespaceTerraformResourceSQSV1
)


Expand Down
5 changes: 5 additions & 0 deletions reconcile/gql_definitions/external_resources/external_resources_namespaces.gql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -156,6 +156,11 @@ query ExternalResourcesNamespaces {
output_resource_name
annotations
tags
managed_by_erv2
delete
module_overrides {
...ExternalResourcesModuleOverrides
}
specs {
defaults
queues {
Expand Down
10 changes: 9 additions & 1 deletion reconcile/gql_definitions/external_resources/external_resources_namespaces.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -238,6 +238,11 @@
output_resource_name
annotations
tags
managed_by_erv2
delete
module_overrides {
...ExternalResourcesModuleOverrides
}
specs {
defaults
queues {
Expand Down Expand Up @@ -780,6 +785,9 @@ class NamespaceTerraformResourceSQSV1(NamespaceTerraformResourceAWSV1):
output_resource_name: Optional[str] = Field(..., alias="output_resource_name")
annotations: Optional[str] = Field(..., alias="annotations")
tags: Optional[str] = Field(..., alias="tags")
managed_by_erv2: Optional[bool] = Field(..., alias="managed_by_erv2")
delete: Optional[bool] = Field(..., alias="delete")
module_overrides: Optional[ExternalResourcesModuleOverrides] = Field(..., alias="module_overrides")
specs: list[SQSQueuesSpecsV1] = Field(..., alias="specs")


Expand Down Expand Up @@ -1140,7 +1148,7 @@ class NamespaceTerraformResourceMskV1(NamespaceTerraformResourceAWSV1):

class NamespaceTerraformProviderResourceAWSV1(NamespaceExternalResourceV1):
provisioner: AWSAccountV1 = Field(..., alias="provisioner")
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")
resources: list[Union[NamespaceTerraformResourceRDSV1, NamespaceTerraformResourceRosaAuthenticatorV1, NamespaceTerraformResourceALBV1, NamespaceTerraformResourceS3V1, NamespaceTerraformResourceElastiCacheV1, NamespaceTerraformResourceCloudWatchV1, NamespaceTerraformResourceASGV1, NamespaceTerraformResourceRoleV1, NamespaceTerraformResourceKMSV1, NamespaceTerraformResourceMskV1, NamespaceTerraformResourceSQSV1, NamespaceTerraformResourceSNSTopicV1, NamespaceTerraformResourceServiceAccountV1, NamespaceTerraformResourceS3SQSV1, NamespaceTerraformResourceRosaAuthenticatorVPCEV1, NamespaceTerraformResourceS3CloudFrontV1, NamespaceTerraformResourceElasticSearchV1, NamespaceTerraformResourceACMV1, NamespaceTerraformResourceKinesisV1, NamespaceTerraformResourceRoute53ZoneV1, NamespaceTerraformResourceDynamoDBV1, NamespaceTerraformResourceECRV1, NamespaceTerraformResourceS3CloudFrontPublicKeyV1, NamespaceTerraformResourceSecretsManagerV1, NamespaceTerraformResourceSecretsManagerServiceAccountV1, NamespaceTerraformResourceAWSV1]] = Field(..., alias="resources")


class EnvironmentV1(ConfiguredBaseModel):
Expand Down
36 changes: 36 additions & 0 deletions reconcile/gql_definitions/introspection.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46779,6 +46779,42 @@
},
"isDeprecated": false,
"deprecationReason": null
},
{
"name": "managed_by_erv2",
"description": null,
"args": [],
"type": {
"kind": "SCALAR",
"name": "Boolean",
"ofType": null
},
"isDeprecated": false,
"deprecationReason": null
},
{
"name": "delete",
"description": null,
"args": [],
"type": {
"kind": "SCALAR",
"name": "Boolean",
"ofType": null
},
"isDeprecated": false,
"deprecationReason": null
},
{
"name": "module_overrides",
"description": null,
"args": [],
"type": {
"kind": "OBJECT",
"name": "ExternalResourcesModuleOverrides_v1",
"ofType": null
},
"isDeprecated": false,
"deprecationReason": null
}
],
"inputFields": null,
Expand Down