qontract-reconcile 0.10.2.dev41__py3-none-any.whl → 0.10.2.dev43__py3-none-any.whl

{qontract_reconcile-0.10.2.dev41.dist-info → qontract_reconcile-0.10.2.dev43.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: qontract-reconcile
-Version: 0.10.2.dev41
+Version: 0.10.2.dev43
 Summary: Collection of tools to reconcile services with their desired state as defined in the app-interface DB.
 Project-URL: homepage, https://github.com/app-sre/qontract-reconcile
 Project-URL: repository, https://github.com/app-sre/qontract-reconcile

{qontract_reconcile-0.10.2.dev41.dist-info → qontract_reconcile-0.10.2.dev43.dist-info}/RECORD

@@ -215,7 +215,7 @@ reconcile/glitchtip_project_alerts/integration.py,sha256=BgMx-NyV9mTuv7Sotb2OioC
 reconcile/glitchtip_project_dsn/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 reconcile/glitchtip_project_dsn/integration.py,sha256=2iugub-kHYkHNK33n0v9_TeWonuxCPah_VkoTPvaajE,8077
 reconcile/gql_definitions/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-reconcile/gql_definitions/introspection.json,sha256=ErIjLKDbNw4SLyGXhp9iGmL1RSfT0U7gU1A3tsn1674,2217790
+reconcile/gql_definitions/introspection.json,sha256=6e7VKZ_Ds1-fNKLF8Jf3yOHZ0SiIeYhAY277cpSoPdE,2235110
 reconcile/gql_definitions/acs/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 reconcile/gql_definitions/acs/acs_instances.py,sha256=L91WW9LbhJbBSrECqShQpFtjoBOsmNIYLRpMbx1io5o,2181
 reconcile/gql_definitions/acs/acs_policies.py,sha256=bN5i4mks10Z23KJSj7jqp966Osq2dps4d-sPH9gjxEA,7008
@@ -279,7 +279,7 @@ reconcile/gql_definitions/common/pipeline_providers.py,sha256=9rpsqPuvj82B4ki56x
 reconcile/gql_definitions/common/quay_instances.py,sha256=toBkdYYVTmEafezAHZKgaW-mQ29xEW6jeronzsAlNyI,1786
 reconcile/gql_definitions/common/quay_orgs.py,sha256=NhA8kqvVUDbrsryEvEL5mlIv5R3T4XNhSRXtfL_yptY,1788
 reconcile/gql_definitions/common/reserved_networks.py,sha256=yP9qSQCaSQcva-ZgTnZp09qH27ur5_qK080ToIs04MY,2560
-reconcile/gql_definitions/common/saas_files.py,sha256=i0U0Ot4DwE3LjigD4ex_ASOPWfSZEpX_4ZrRaWlUhW8,16854
+reconcile/gql_definitions/common/saas_files.py,sha256=Z_ESsBaZVfSyCYN9RrNaOAQyUll6Cgh7hHGQcTPkenY,17792
 reconcile/gql_definitions/common/saas_target_namespaces.py,sha256=4VYP2VbwY8WVwtSFk2-jsUNhSmRD3X4FWKxetOKvmd0,2835
 reconcile/gql_definitions/common/saasherder_settings.py,sha256=nqQLcMwYxLseqq0BEcVvmrpIj2eQq0h8XDSpLN6GGCw,1793
 reconcile/gql_definitions/common/slack_workspaces.py,sha256=2o0kgi4QiaRuNmZJnc_By4F6NsKIdRaXkrufRQw7Nok,1753
@@ -537,7 +537,7 @@ reconcile/typed_queries/pagerduty_instances.py,sha256=zxCNxMak4iikryePaRi71lTADV
 reconcile/typed_queries/quay.py,sha256=3IMy9jjHF2f9t47EXZOQVA3p0nFkWFhaFhxhvib-71o,644
 reconcile/typed_queries/repos.py,sha256=8A93dKDt6igT4ClqMjt7YUTsoP4qh1Wnm0W3xsMgj48,824
 reconcile/typed_queries/reserved_networks.py,sha256=XY9y3amtIQT0n06O0Toubqr_UmylJ2ELAv9-BJCK890,345
-reconcile/typed_queries/saas_files.py,sha256=MdU-D4a8JpJ8FDRVOCy1Bkf26qpdH-7sXY2W6eWdAWw,13993
+reconcile/typed_queries/saas_files.py,sha256=JTs865Bqt4KuVh-_ze8IKLe_V1RRBnR7w2nveaUXXLw,14194
 reconcile/typed_queries/slack.py,sha256=r30lspctHloyygPn8_DVybxPwUWwiBpvBRRXiTVcQYk,251
 reconcile/typed_queries/slo_documents.py,sha256=YMdox_-lBRqrdxamPhdnUlRTY_Ro35ptsupq7OaynUQ,362
 reconcile/typed_queries/smtp.py,sha256=aSLglYa5bHKmlGwKkxq2RZqyMWuAf0a4S_mOuhDa084,542
@@ -633,7 +633,7 @@ reconcile/utils/state.py,sha256=az4tBmZ0EdbFcAGiBVUxs3cr2-BVWsuDQiNTvjjQq8s,1637
 reconcile/utils/structs.py,sha256=LcbLEg8WxfRqM6nW7NhcWN0YeqF7SQzxOgntmLs1SgY,352
 reconcile/utils/template.py,sha256=wTvRU4AnAV_o042tD4Mwls2dwWMuk7MKnde3MaCjaYg,331
 reconcile/utils/terraform_client.py,sha256=H8frsS370y8xfivKLNBD1dwlBLHvfuR6JSN_syBL5Qc,36033
-reconcile/utils/terrascript_aws_client.py,sha256=UdEM3JeTMiE0VRqtz7gcBWR-c0fouORtPFrniRJ3pao,283505
+reconcile/utils/terrascript_aws_client.py,sha256=SNGtsG1n-IDZaI0blKLm3t3AfVNmxW-O8Y8NtX08OOc,270318
 reconcile/utils/three_way_diff_strategy.py,sha256=oQcHXd9LVhirJfoaOBoHUYuZVGfyL2voKr6KVI34zZE,4833
 reconcile/utils/throughput.py,sha256=iP4UWAe2LVhDo69mPPmgo9nQ7RxHD6_GS8MZe-aSiuM,344
 reconcile/utils/vault.py,sha256=aSA8l9cJlPUHpChFGl27nSY-Mpq9FMjBo7Dcgb1BVfM,15036
@@ -725,9 +725,9 @@ reconcile/utils/runtime/meta.py,sha256=dWdKS9eHVuowFkTK4lgXJ723vS1y9giOMzePUKnHn
 reconcile/utils/runtime/runner.py,sha256=I30KRrX1UQbHc_Ir1cIZX3OfNSdoHKdnDSPAEB69Ilk,7944
 reconcile/utils/runtime/sharding.py,sha256=r0ieUtNed7NvknSw6qQrCkKpVXE1shuHGnfFcnpA_k4,16142
 reconcile/utils/saasherder/__init__.py,sha256=3U8plqMAPRE1kjwZ5YnIsYsggTf4_gS7flRUEuXVBAs,343
-reconcile/utils/saasherder/interfaces.py,sha256=C2wrw34OXypshVocAsPrVZsSHptgw4g9u7Haa2wulZQ,9087
-reconcile/utils/saasherder/models.py,sha256=z8ln03zi2a8cu716NcNUDHp8Dv1VcVbhqdWVxCl7x9A,10148
-reconcile/utils/saasherder/saasherder.py,sha256=TP33j32cZA3-QdkG1i4wTUyWf9X1tiGoT0_5YNo2K98,86338
+reconcile/utils/saasherder/interfaces.py,sha256=M9NG3tFDMdd4t44NTGwDqpiZ-Tt0qMEsXiqsYszXbT4,9180
+reconcile/utils/saasherder/models.py,sha256=JaOz_DEtudJZhiDe90kaBlJkppFufn81V92oK9PHYx0,10208
+reconcile/utils/saasherder/saasherder.py,sha256=1H6ZpyveYiqTrggsQT4LvWd1J0vacbFV6_iSjjnlQ6k,87144
 reconcile/utils/terraform/__init__.py,sha256=zNbiyTWo35AT1sFTElL2j_AA0jJ_yWE_bfFn-nD2xik,250
 reconcile/utils/terraform/config.py,sha256=5UVrd563TMcvi4ooa5JvWVDW1I3bIWg484u79evfV_8,164
 reconcile/utils/terraform/config_client.py,sha256=gRL1rQ0AqvShei_rcGqC3HDYGskOFKE1nPrJyJE9yno,4676
@@ -773,7 +773,7 @@ tools/saas_promotion_state/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJ
 tools/saas_promotion_state/saas_promotion_state.py,sha256=UfwwRLS5Ya4_Nh1w5n1dvoYtchQvYE9yj1VANt2IKqI,3925
 tools/sre_checkpoints/__init__.py,sha256=CDaDaywJnmRCLyl_NCcvxi-Zc0hTi_3OdwKiFOyS39I,145
 tools/sre_checkpoints/util.py,sha256=zEDbGr18ZeHNQwW8pUsr2JRjuXIPz--WAGJxZo9sv_Y,894
-qontract_reconcile-0.10.2.dev41.dist-info/METADATA,sha256=8PiKTa5Okn_uKzxrj2VGYxeESqL-AQxMfyTWp7ivUgo,24665
-qontract_reconcile-0.10.2.dev41.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-qontract_reconcile-0.10.2.dev41.dist-info/entry_points.txt,sha256=5i9l54La3vQrDLAdwDKQWC0iG4sV9RRfOb1BpvzOWLc,698
-qontract_reconcile-0.10.2.dev41.dist-info/RECORD,,
+qontract_reconcile-0.10.2.dev43.dist-info/METADATA,sha256=dR0wcgtr249AUyR4Ry3LQDzF8VgP0FQO4AEs_sCbJLM,24665
+qontract_reconcile-0.10.2.dev43.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+qontract_reconcile-0.10.2.dev43.dist-info/entry_points.txt,sha256=5i9l54La3vQrDLAdwDKQWC0iG4sV9RRfOb1BpvzOWLc,698
+qontract_reconcile-0.10.2.dev43.dist-info/RECORD,,

reconcile/gql_definitions/common/saas_files.py

@@ -302,6 +302,15 @@ query SaasFiles {
           }
           name
         }
+        images {
+          org {
+            name
+            instance {
+              url
+            }
+          }
+          name
+        }
         disable
         delete
       }
@@ -508,6 +517,20 @@ class SaasResourceTemplateTargetImageV1(ConfiguredBaseModel):
     name: str = Field(..., alias="name")
 
 
+class SaasResourceTemplateTargetV2_SaasResourceTemplateTargetImageV1_QuayOrgV1_QuayInstanceV1(ConfiguredBaseModel):
+    url: str = Field(..., alias="url")
+
+
+class SaasResourceTemplateTargetV2_SaasResourceTemplateTargetImageV1_QuayOrgV1(ConfiguredBaseModel):
+    name: str = Field(..., alias="name")
+    instance: SaasResourceTemplateTargetV2_SaasResourceTemplateTargetImageV1_QuayOrgV1_QuayInstanceV1 = Field(..., alias="instance")
+
+
+class SaasResourceTemplateTargetV2_SaasResourceTemplateTargetImageV1(ConfiguredBaseModel):
+    org: SaasResourceTemplateTargetV2_SaasResourceTemplateTargetImageV1_QuayOrgV1 = Field(..., alias="org")
+    name: str = Field(..., alias="name")
+
+
 class SaasResourceTemplateTargetV2(ConfiguredBaseModel):
     path: Optional[str] = Field(..., alias="path")
     name: Optional[str] = Field(..., alias="name")
@@ -520,6 +543,7 @@ class SaasResourceTemplateTargetV2(ConfiguredBaseModel):
     secret_parameters: Optional[list[SaasResourceTemplateTargetV2_SaasSecretParametersV1]] = Field(..., alias="secretParameters")
     upstream: Optional[SaasResourceTemplateTargetUpstreamV1] = Field(..., alias="upstream")
     image: Optional[SaasResourceTemplateTargetImageV1] = Field(..., alias="image")
+    images: Optional[list[SaasResourceTemplateTargetV2_SaasResourceTemplateTargetImageV1]] = Field(..., alias="images")
     disable: Optional[bool] = Field(..., alias="disable")
     delete: Optional[bool] = Field(..., alias="delete")
 

reconcile/gql_definitions/introspection.json

@@ -3755,6 +3755,57 @@
                             },
                             "isDeprecated": false,
                             "deprecationReason": null
+                        },
+                        {
+                            "name": "managed_dynatrace_token_provider_labels_v1",
+                            "description": null,
+                            "args": [
+                                {
+                                    "name": "name",
+                                    "description": null,
+                                    "type": {
+                                        "kind": "SCALAR",
+                                        "name": "String",
+                                        "ofType": null
+                                    },
+                                    "defaultValue": null
+                                },
+                                {
+                                    "name": "path",
+                                    "description": null,
+                                    "type": {
+                                        "kind": "SCALAR",
+                                        "name": "String",
+                                        "ofType": null
+                                    },
+                                    "defaultValue": null
+                                },
+                                {
+                                    "name": "filter",
+                                    "description": null,
+                                    "type": {
+                                        "kind": "SCALAR",
+                                        "name": "JSON",
+                                        "ofType": null
+                                    },
+                                    "defaultValue": null
+                                }
+                            ],
+                            "type": {
+                                "kind": "LIST",
+                                "name": null,
+                                "ofType": {
+                                    "kind": "NON_NULL",
+                                    "name": null,
+                                    "ofType": {
+                                        "kind": "OBJECT",
+                                        "name": "ManagedDynatraceTokenProviderLabels_v1",
+                                        "ofType": null
+                                    }
+                                }
+                            },
+                            "isDeprecated": false,
+                            "deprecationReason": null
                         }
                     ],
                     "inputFields": null,
@@ -5568,6 +5619,11 @@
                             "name": "AppChangelog_v1",
                             "ofType": null
                         },
+                        {
+                            "kind": "OBJECT",
+                            "name": "ManagedDynatraceTokenProviderLabels_v1",
+                            "ofType": null
+                        },
                         {
                             "kind": "OBJECT",
                             "name": "DatabaseAccess_v1",
@@ -22295,6 +22351,26 @@
                             "isDeprecated": false,
                             "deprecationReason": null
                         },
+                        {
+                            "name": "images",
+                            "description": null,
+                            "args": [],
+                            "type": {
+                                "kind": "LIST",
+                                "name": null,
+                                "ofType": {
+                                    "kind": "NON_NULL",
+                                    "name": null,
+                                    "ofType": {
+                                        "kind": "OBJECT",
+                                        "name": "SaasResourceTemplateTargetImage_v1",
+                                        "ofType": null
+                                    }
+                                }
+                            },
+                            "isDeprecated": false,
+                            "deprecationReason": null
+                        },
                         {
                             "name": "image",
                             "description": null,
@@ -34204,6 +34280,249 @@
                     "enumValues": null,
                     "possibleTypes": null
                 },
+                {
+                    "kind": "OBJECT",
+                    "name": "ManagedDynatraceTokenProviderLabels_v1",
+                    "description": null,
+                    "fields": [
+                        {
+                            "name": "schema",
+                            "description": null,
+                            "args": [],
+                            "type": {
+                                "kind": "NON_NULL",
+                                "name": null,
+                                "ofType": {
+                                    "kind": "SCALAR",
+                                    "name": "String",
+                                    "ofType": null
+                                }
+                            },
+                            "isDeprecated": false,
+                            "deprecationReason": null
+                        },
+                        {
+                            "name": "path",
+                            "description": null,
+                            "args": [],
+                            "type": {
+                                "kind": "NON_NULL",
+                                "name": null,
+                                "ofType": {
+                                    "kind": "SCALAR",
+                                    "name": "String",
+                                    "ofType": null
+                                }
+                            },
+                            "isDeprecated": false,
+                            "deprecationReason": null
+                        },
+                        {
+                            "name": "name",
+                            "description": null,
+                            "args": [],
+                            "type": {
+                                "kind": "NON_NULL",
+                                "name": null,
+                                "ofType": {
+                                    "kind": "SCALAR",
+                                    "name": "String",
+                                    "ofType": null
+                                }
+                            },
+                            "isDeprecated": false,
+                            "deprecationReason": null
+                        },
+                        {
+                            "name": "description",
+                            "description": null,
+                            "args": [],
+                            "type": {
+                                "kind": "SCALAR",
+                                "name": "String",
+                                "ofType": null
+                            },
+                            "isDeprecated": false,
+                            "deprecationReason": null
+                        },
+                        {
+                            "name": "ocm",
+                            "description": null,
+                            "args": [],
+                            "type": {
+                                "kind": "NON_NULL",
+                                "name": null,
+                                "ofType": {
+                                    "kind": "OBJECT",
+                                    "name": "OpenShiftClusterManager_v1",
+                                    "ofType": null
+                                }
+                            },
+                            "isDeprecated": false,
+                            "deprecationReason": null
+                        },
+                        {
+                            "name": "labelDefaults",
+                            "description": null,
+                            "args": [],
+                            "type": {
+                                "kind": "NON_NULL",
+                                "name": null,
+                                "ofType": {
+                                    "kind": "LIST",
+                                    "name": null,
+                                    "ofType": {
+                                        "kind": "NON_NULL",
+                                        "name": null,
+                                        "ofType": {
+                                            "kind": "OBJECT",
+                                            "name": "DynatraceTokenProviderLabelDefault_v1",
+                                            "ofType": null
+                                        }
+                                    }
+                                }
+                            },
+                            "isDeprecated": false,
+                            "deprecationReason": null
+                        },
+                        {
+                            "name": "clusters",
+                            "description": null,
+                            "args": [],
+                            "type": {
+                                "kind": "NON_NULL",
+                                "name": null,
+                                "ofType": {
+                                    "kind": "LIST",
+                                    "name": null,
+                                    "ofType": {
+                                        "kind": "NON_NULL",
+                                        "name": null,
+                                        "ofType": {
+                                            "kind": "OBJECT",
+                                            "name": "OpenShiftClusterManagerUpgradePolicyCluster_v1",
+                                            "ofType": null
+                                        }
+                                    }
+                                }
+                            },
+                            "isDeprecated": false,
+                            "deprecationReason": null
+                        }
+                    ],
+                    "inputFields": null,
+                    "interfaces": [
+                        {
+                            "kind": "INTERFACE",
+                            "name": "DatafileObject_v1",
+                            "ofType": null
+                        }
+                    ],
+                    "enumValues": null,
+                    "possibleTypes": null
+                },
+                {
+                    "kind": "OBJECT",
+                    "name": "DynatraceTokenProviderLabelDefault_v1",
+                    "description": null,
+                    "fields": [
+                        {
+                            "name": "name",
+                            "description": null,
+                            "args": [],
+                            "type": {
+                                "kind": "NON_NULL",
+                                "name": null,
+                                "ofType": {
+                                    "kind": "SCALAR",
+                                    "name": "String",
+                                    "ofType": null
+                                }
+                            },
+                            "isDeprecated": false,
+                            "deprecationReason": null
+                        },
+                        {
+                            "name": "matchLabels",
+                            "description": null,
+                            "args": [],
+                            "type": {
+                                "kind": "NON_NULL",
+                                "name": null,
+                                "ofType": {
+                                    "kind": "SCALAR",
+                                    "name": "JSON",
+                                    "ofType": null
+                                }
+                            },
+                            "isDeprecated": false,
+                            "deprecationReason": null
+                        },
+                        {
+                            "name": "labelTemplate",
+                            "description": null,
+                            "args": [],
+                            "type": {
+                                "kind": "OBJECT",
+                                "name": "DynatraceTokenProviderLabelTemplate_v1",
+                                "ofType": null
+                            },
+                            "isDeprecated": false,
+                            "deprecationReason": null
+                        }
+                    ],
+                    "inputFields": null,
+                    "interfaces": [],
+                    "enumValues": null,
+                    "possibleTypes": null
+                },
+                {
+                    "kind": "OBJECT",
+                    "name": "DynatraceTokenProviderLabelTemplate_v1",
+                    "description": null,
+                    "fields": [
+                        {
+                            "name": "path",
+                            "description": null,
+                            "args": [],
+                            "type": {
+                                "kind": "OBJECT",
+                                "name": "Resource_v1",
+                                "ofType": null
+                            },
+                            "isDeprecated": false,
+                            "deprecationReason": null
+                        },
+                        {
+                            "name": "type",
+                            "description": null,
+                            "args": [],
+                            "type": {
+                                "kind": "SCALAR",
+                                "name": "String",
+                                "ofType": null
+                            },
+                            "isDeprecated": false,
+                            "deprecationReason": null
+                        },
+                        {
+                            "name": "variables",
+                            "description": null,
+                            "args": [],
+                            "type": {
+                                "kind": "SCALAR",
+                                "name": "JSON",
+                                "ofType": null
+                            },
+                            "isDeprecated": false,
+                            "deprecationReason": null
+                        }
+                    ],
+                    "inputFields": null,
+                    "interfaces": [],
+                    "enumValues": null,
+                    "possibleTypes": null
+                },
                 {
                     "kind": "OBJECT",
                     "name": "__Schema",
@@ -38529,6 +38848,81 @@
                     "enumValues": null,
                     "possibleTypes": null
                 },
+                {
+                    "kind": "OBJECT",
+                    "name": "DynatraceTokenProviderCluster_v1",
+                    "description": null,
+                    "fields": [
+                        {
+                            "name": "name",
+                            "description": null,
+                            "args": [],
+                            "type": {
+                                "kind": "NON_NULL",
+                                "name": null,
+                                "ofType": {
+                                    "kind": "SCALAR",
+                                    "name": "String",
+                                    "ofType": null
+                                }
+                            },
+                            "isDeprecated": false,
+                            "deprecationReason": null
+                        },
+                        {
+                            "name": "serverUrl",
+                            "description": null,
+                            "args": [],
+                            "type": {
+                                "kind": "NON_NULL",
+                                "name": null,
+                                "ofType": {
+                                    "kind": "SCALAR",
+                                    "name": "String",
+                                    "ofType": null
+                                }
+                            },
+                            "isDeprecated": false,
+                            "deprecationReason": null
+                        },
+                        {
+                            "name": "serverId",
+                            "description": null,
+                            "args": [],
+                            "type": {
+                                "kind": "NON_NULL",
+                                "name": null,
+                                "ofType": {
+                                    "kind": "SCALAR",
+                                    "name": "String",
+                                    "ofType": null
+                                }
+                            },
+                            "isDeprecated": false,
+                            "deprecationReason": null
+                        },
+                        {
+                            "name": "labels",
+                            "description": null,
+                            "args": [],
+                            "type": {
+                                "kind": "NON_NULL",
+                                "name": null,
+                                "ofType": {
+                                    "kind": "SCALAR",
+                                    "name": "JSON",
+                                    "ofType": null
+                                }
+                            },
+                            "isDeprecated": false,
+                            "deprecationReason": null
+                        }
+                    ],
+                    "inputFields": null,
+                    "interfaces": [],
+                    "enumValues": null,
+                    "possibleTypes": null
+                },
                 {
                     "kind": "OBJECT",
                     "name": "NamespaceCNAsset_v1",

reconcile/typed_queries/saas_files.py

@@ -26,6 +26,7 @@ from reconcile.gql_definitions.common.saas_files import (
     SaasResourceTemplateTargetPromotionV1,
     SaasResourceTemplateTargetUpstreamV1,
     SaasResourceTemplateTargetV2,
+    SaasResourceTemplateTargetV2_SaasResourceTemplateTargetImageV1,
     SaasResourceTemplateTargetV2_SaasSecretParametersV1,
     SaasResourceTemplateV2_SaasSecretParametersV1,
     SaasSecretParametersV1,
@@ -65,6 +66,9 @@ class SaasResourceTemplateTarget(ConfiguredBaseModel):
     ) = Field(..., alias="secretParameters")
     upstream: SaasResourceTemplateTargetUpstreamV1 | None = Field(..., alias="upstream")
     image: SaasResourceTemplateTargetImageV1 | None = Field(..., alias="image")
+    images: (
+        list[SaasResourceTemplateTargetV2_SaasResourceTemplateTargetImageV1] | None
+    ) = Field(..., alias="images")
     disable: bool | None = Field(..., alias="disable")
     delete: bool | None = Field(..., alias="delete")
 

reconcile/utils/saasherder/interfaces.py

@@ -326,6 +326,9 @@ class SaasResourceTemplateTarget(HasParameters, HasSecretParameters, Protocol):
     @property
     def image(self) -> SaasResourceTemplateTargetImage | None: ...
 
+    @property
+    def images(self) -> Sequence[SaasResourceTemplateTargetImage] | None: ...
+
     def uid(
         self, parent_saas_file_name: str, parent_resource_template_name: str
     ) -> str: ...

reconcile/utils/saasherder/models.py

@@ -113,14 +113,15 @@ class TriggerSpecUpstreamJob(TriggerSpecBase):
 
 @dataclass
 class TriggerSpecContainerImage(TriggerSpecBase):
-    image: str
+    images: Sequence[str]
     reason: str | None = None
 
     @property
     def state_key(self) -> str:
+        image_key = "/".join(sorted(self.images))
         key = (
             f"{self.saas_file_name}/{self.resource_template_name}/{self.cluster_name}/"
-            f"{self.namespace_name}/{self.env_name}/{self.image}"
+            f"{self.namespace_name}/{self.env_name}/{image_key}"
         )
         return key
 

reconcile/utils/saasherder/saasherder.py

@@ -102,6 +102,10 @@ Resource = dict[str, Any]
 Resources = list[Resource]
 
 
+class TriggerSpecContainerImageError(Exception):
+    pass
+
+
 class SaasHerder:  # pylint: disable=too-many-public-methods
     """Wrapper around SaaS deployment actions."""
 
@@ -1616,25 +1620,36 @@ class SaasHerder:  # pylint: disable=too-many-public-methods
         for rt in saas_file.resource_templates:
             for target in rt.targets:
                 try:
-                    if not target.image:
+                    if not (target.image or target.images):
                         continue
+                    if target.image and target.images:
+                        raise TriggerSpecContainerImageError(
+                            '"image" and "images" are mutually exclusive. Do not set both in the same saas target.'
+                        )
                     commit_sha = self._get_commit_sha(
                         url=rt.url,
                         ref=target.ref,
                         github=github,
                     )
-                    desired_image_tag = commit_sha[: rt.hash_length or self.hash_length]
-                    # don't trigger if image doesn't exist
-                    image_registry = f"{target.image.org.instance.url}/{target.image.org.name}/{target.image.name}"
-                    image_uri = f"{image_registry}:{desired_image_tag}"
                     image_auth = self._initiate_image_auth(saas_file)
+                    desired_image_tag = commit_sha[: rt.hash_length or self.hash_length]
+
+                    all_images = [target.image] if target.image else target.images or []
+                    image_registries = [
+                        f"{image.org.instance.url}/{image.org.name}/{image.name}"
+                        for image in all_images
+                    ]
                     error_prefix = f"[{saas_file.name}/{rt.name}] {target.ref}:"
-                    image = self._get_image(
-                        image_uri, saas_file.image_patterns, image_auth, error_prefix
-                    )
-                    if not image:
+                    if not all(
+                        self._get_image(
+                            image=f"{image}:{desired_image_tag}",
+                            image_patterns=saas_file.image_patterns,
+                            image_auth=image_auth,
+                            error_prefix=error_prefix,
+                        )
+                        for image in image_registries
+                    ):
                         continue
-
                     trigger_spec = TriggerSpecContainerImage(
                         saas_file_name=saas_file.name,
                         env_name=target.namespace.environment.name,
@@ -1643,12 +1658,16 @@ class SaasHerder:  # pylint: disable=too-many-public-methods
                         resource_template_name=rt.name,
                         cluster_name=target.namespace.cluster.name,
                         namespace_name=target.namespace.name,
-                        image=image_registry,
+                        images=image_registries,
                         state_content=desired_image_tag,
                     )
                     if self.include_trigger_trace:
+                        image_uris = ", ".join(
+                            f"{image}:{desired_image_tag}"
+                            for image in sorted(image_registries)
+                        )
                         trigger_spec.reason = (
-                            f"{rt.url}/commit/{commit_sha} build {image_uri}"
+                            f"{rt.url}/commit/{commit_sha} build {image_uris}"
                         )
                     if not self.state:
                         raise Exception("state is not initialized")

reconcile/utils/terrascript_aws_client.py

@@ -77,8 +77,6 @@ from terrascript.resource import (
     aws_ec2_transit_gateway_vpc_attachment,
     aws_ec2_transit_gateway_vpc_attachment_accepter,
     aws_ecr_repository,
-    aws_elasticache_parameter_group,
-    aws_elasticache_replication_group,
     aws_elasticsearch_domain,
     aws_iam_access_key,
     aws_iam_group,
@@ -106,8 +104,6 @@ from terrascript.resource import (
     aws_lb_listener_rule,
     aws_lb_target_group,
     aws_lb_target_group_attachment,
-    aws_msk_cluster,
-    aws_msk_configuration,
     aws_ram_principal_association,
     aws_ram_resource_association,
     aws_ram_resource_share,
@@ -1645,8 +1641,6 @@ class TerrascriptClient:  # pylint: disable=too-many-public-methods
             self.populate_tf_resource_rds(spec)
         elif provider == "s3":
             self.populate_tf_resource_s3(spec)
-        elif provider == "elasticache":
-            self.populate_tf_resource_elasticache(spec)
         elif provider == "aws-iam-service-account":
             self.populate_tf_resource_service_account(spec, ocm_map=ocm_map)
         elif provider == "secrets-manager-service-account":
@@ -1689,8 +1683,6 @@ class TerrascriptClient:  # pylint: disable=too-many-public-methods
             self.populate_tf_resource_rosa_authenticator(spec)
         elif provider == "rosa-authenticator-vpce":
             self.populate_tf_resource_rosa_authenticator_vpce(spec)
-        elif provider == "msk":
-            self.populate_tf_resource_msk(spec)
         else:
             raise UnknownProviderError(provider)
 
@@ -2491,94 +2483,6 @@ class TerrascriptClient:  # pylint: disable=too-many-public-methods
 
         return bucket_tf_resource
 
-    def populate_tf_resource_elasticache(self, spec):
-        account = spec.provisioner_name
-        identifier = spec.identifier
-        values = self.init_values(spec)
-        output_prefix = spec.output_prefix
-        values.setdefault("replication_group_id", values["identifier"])
-        values.pop("identifier", None)
-
-        tf_resources = []
-        self.init_common_outputs(tf_resources, spec)
-
-        default_region = self.default_regions.get(account)
-        desired_region = values.pop("region", default_region)
-
-        provider = ""
-        if desired_region is not None and self._multiregion_account(account):
-            provider = "aws." + desired_region
-            values["provider"] = provider
-
-        if not values.get("apply_immediately"):
-            values["apply_immediately"] = False
-
-        parameter_group = values.get("parameter_group")
-        # Assume that cluster enabled is false if parameter group unset
-        pg_cluster_enabled = False
-
-        if parameter_group:
-            pg_values = self.get_values(parameter_group)
-            pg_name = pg_values["name"]
-            pg_identifier = pg_name
-
-            # If the desired region is not the same as the default region
-            # we append the region to the identifier to make it unique
-            # in the terraform config
-            if desired_region is not None and desired_region != default_region:
-                pg_identifier = f"{pg_name}-{desired_region}"
-
-            pg_values["parameter"] = pg_values.pop("parameters")
-            for param in pg_values["parameter"]:
-                if param["name"] == "cluster-enabled" and param["value"] == "yes":
-                    pg_cluster_enabled = True
-
-            if self._multiregion_account(account) and len(provider) > 0:
-                pg_values["provider"] = provider
-            pg_tf_resource = aws_elasticache_parameter_group(pg_identifier, **pg_values)
-            tf_resources.append(pg_tf_resource)
-            values["depends_on"] = [
-                f"aws_elasticache_parameter_group.{pg_identifier}",
-            ]
-            values["parameter_group_name"] = pg_name
-            values.pop("parameter_group", None)
-
-        auth_token = spec.get_secret_field("db.auth_token")
-        if not auth_token:
-            auth_token = self.generate_random_password()
-
-        if values.get("transit_encryption_enabled", False):
-            values["auth_token"] = auth_token
-
-        # elasticache replication group
-        # Ref: https://www.terraform.io/docs/providers/aws/r/
-        # elasticache_replication_group.html
-        tf_resource = aws_elasticache_replication_group(identifier, **values)
-        tf_resources.append(tf_resource)
-        # elasticache outputs
-        # we want the outputs to be formed into an OpenShift Secret
-        # with the following fields
-        # db.endpoint
-        output_name = output_prefix + "__db_endpoint"
-        # https://docs.aws.amazon.com/AmazonElastiCache/
-        # latest/red-ug/Endpoints.html
-        if pg_cluster_enabled:
-            output_value = "${" + tf_resource.configuration_endpoint_address + "}"
-        else:
-            output_value = "${" + tf_resource.primary_endpoint_address + "}"
-        tf_resources.append(Output(output_name, value=output_value))
-        # db.port
-        output_name = output_prefix + "__db_port"
-        output_value = "${" + str(tf_resource.port) + "}"
-        tf_resources.append(Output(output_name, value=output_value))
-        # db.auth_token
-        if values.get("transit_encryption_enabled", False):
-            output_name = output_prefix + "__db_auth_token"
-            output_value = values["auth_token"]
-            tf_resources.append(Output(output_name, value=output_value, sensitive=True))
-
-        self.add_resources(account, tf_resources)
-
     def populate_tf_resource_service_account(self, spec, ocm_map=None):
         account = spec.provisioner_name
         identifier = spec.identifier
@@ -4287,24 +4191,6 @@ class TerrascriptClient:  # pylint: disable=too-many-public-methods
                     values["db_name"] = db_name
                 if values.get("replica_source"):
                     values.pop("db_name", None)
-            elif spec.provider == "elasticache":
-                if description := values.pop("replication_group_description", None):
-                    values["description"] = description
-                if num_cache_clusters := values.pop("number_cache_clusters", None):
-                    values["num_cache_clusters"] = num_cache_clusters
-                if cluster_mode := values.pop("cluster_mode", {}):
-                    for k, v in cluster_mode.items():
-                        values[k] = v
-                values.pop("availability_zones", None)
-            elif spec.provider == "msk":
-                if ebs_volume_size := values.get("broker_node_group_info", {}).pop(
-                    "ebs_volume_size", None
-                ):
-                    values["broker_node_group_info"].setdefault(
-                        "storage_info", {}
-                    ).setdefault("ebs_storage_info", {})[
-                        "volume_size"
-                    ] = ebs_volume_size
 
         return values
 
@@ -6656,205 +6542,6 @@ class TerrascriptClient:  # pylint: disable=too-many-public-methods
 
         self.add_resources(account, tf_resources)
 
-    def populate_tf_resource_msk(self, spec):
-        account = spec.provisioner_name
-        values = self.init_values(spec)
-        output_prefix = spec.output_prefix
-        tf_resources = []
-        resource_id = spec.identifier
-
-        del values["identifier"]
-        values.setdefault("cluster_name", spec.identifier)
-
-        # common
-        self.init_common_outputs(tf_resources, spec)
-
-        # validations
-        if (
-            values["number_of_broker_nodes"]
-            % len(values["broker_node_group_info"]["client_subnets"])
-            != 0
-        ):
-            raise ValueError(
-                "number_of_broker_nodes must be a multiple of the number of specified client subnets."
-            )
-
-        scram_enabled = (
-            values.get("client_authentication", {}).get("sasl", {}).get("scram", False)
-        )
-        scram_users = {}
-        if scram_enabled:
-            if not spec.resource.get("users", []):
-                raise ValueError(
-                    "users attribute must be given when client_authentication.sasl.scram is enabled."
-                )
-            scram_users = {
-                user["name"]: self.secret_reader.read_all(user["secret"])
-                for user in spec.resource["users"]
-            }
-            # validate user objects
-            for user, secret in scram_users.items():
-                if secret.keys() != {"password", "username"}:
-                    raise ValueError(
-                        f"MSK user '{user}' secret must contain only 'username' and 'password' keys!"
-                    )
-
-        # resource - msk config
-        # unique msk config resource name enables "create_before_destroy" lifecycle
-        # which is required when changing version which requires a resource replacement
-        msk_version_str = values["kafka_version"].replace(".", "-")
-        msk_config_name = f"{resource_id}-{msk_version_str}"
-        msk_config = aws_msk_configuration(
-            msk_config_name,
-            name=msk_config_name,
-            kafka_versions=[values["kafka_version"]],
-            server_properties=values["server_properties"],
-            # lifecycle create_before_destroy is required to ensure that the config is created
-            # before it is assigned to the cluster
-            lifecycle={
-                "create_before_destroy": True,
-            },
-        )
-        tf_resources.append(msk_config)
-        values.pop("server_properties", None)
-
-        # resource - cluster
-        values["configuration_info"] = {
-            "arn": "${" + msk_config.arn + "}",
-            "revision": "${" + msk_config.latest_revision + "}",
-        }
-        msk_cluster = aws_msk_cluster(resource_id, **values)
-        tf_resources.append(msk_cluster)
-
-        # resource - cloudwatch
-        if (
-            values.get("logging_info", {})
-            .get("broker_logs", {})
-            .get("cloudwatch_logs", {})
-            .get("enabled", False)
-        ):
-            log_group_values = {
-                "name": f"{resource_id}-msk-broker-logs",
-                "tags": values["tags"],
-                "retention_in_days": values["logging_info"]["broker_logs"][
-                    "cloudwatch_logs"
-                ]["retention_in_days"],
-            }
-            log_group_tf_resource = aws_cloudwatch_log_group(
-                resource_id, **log_group_values
-            )
-            tf_resources.append(log_group_tf_resource)
-            del values["logging_info"]["broker_logs"]["cloudwatch_logs"][
-                "retention_in_days"
-            ]
-            values["logging_info"]["broker_logs"]["cloudwatch_logs"]["log_group"] = (
-                log_group_tf_resource.name
-            )
-
-        # resource - secret manager for SCRAM client credentials
-        if scram_enabled and scram_users:
-            scram_secrets: list[
-                tuple[aws_secretsmanager_secret, aws_secretsmanager_secret_version]
-            ] = []
-
-            # kms
-            kms_values = {
-                "description": "KMS key for MSK SCRAM credentials",
-                "tags": values["tags"],
-            }
-            kms_key = aws_kms_key(resource_id, **kms_values)
-            tf_resources.append(kms_key)
-
-            kms_key_alias = aws_kms_alias(
-                resource_id,
-                name=f"alias/{resource_id}-msk-scram",
-                target_key_id="${" + kms_key.arn + "}",
-            )
-            tf_resources.append(kms_key_alias)
-
-            for user, secret in scram_users.items():
-                secret_identifier = f"AmazonMSK_{resource_id}-{user}"
-
-                secret_values = {
-                    "name": secret_identifier,
-                    "tags": values["tags"],
-                    "kms_key_id": "${" + kms_key.arn + "}",
-                }
-                secret_resource = aws_secretsmanager_secret(
-                    secret_identifier, **secret_values
-                )
-                tf_resources.append(secret_resource)
-
-                version_values = {
-                    "secret_id": "${" + secret_resource.arn + "}",
-                    "secret_string": json.dumps(secret, sort_keys=True),
-                }
-                version_resource = aws_secretsmanager_secret_version(
-                    secret_identifier, **version_values
-                )
-                tf_resources.append(version_resource)
-
-                secret_policy_values = {
-                    "secret_arn": "${" + secret_resource.arn + "}",
-                    "policy": json.dumps({
-                        "Version": "2012-10-17",
-                        "Statement": [
-                            {
-                                "Sid": "AWSKafkaResourcePolicy",
-                                "Effect": "Allow",
-                                "Principal": {"Service": "kafka.amazonaws.com"},
-                                "Action": "secretsmanager:getSecretValue",
-                                "Resource": "${" + secret_resource.arn + "}",
-                            }
-                        ],
-                    }),
-                }
-                secret_policy = aws_secretsmanager_secret_policy(
-                    secret_identifier, **secret_policy_values
-                )
-                tf_resources.append(secret_policy)
-                scram_secrets.append((secret_resource, version_resource))
-
-            # create ONE scram secret association for each secret created above
-            scram_secret_association_values = {
-                "cluster_arn": "${" + msk_cluster.arn + "}",
-                "secret_arn_list": ["${" + s.arn + "}" for s, _ in scram_secrets],
-                "depends_on": self.get_dependencies([v for _, v in scram_secrets]),
-            }
-            scram_secret_association = aws_msk_scram_secret_association(
-                resource_id, **scram_secret_association_values
-            )
-            tf_resources.append(scram_secret_association)
-
-        # outputs
-        tf_resources += [
-            Output(
-                output_prefix + "__zookeeper_connect_string",
-                value="${" + msk_cluster.zookeeper_connect_string + "}",
-            ),
-            Output(
-                output_prefix + "__zookeeper_connect_string_tls",
-                value="${" + msk_cluster.zookeeper_connect_string_tls + "}",
-            ),
-            Output(
-                output_prefix + "__bootstrap_brokers",
-                value="${" + msk_cluster.bootstrap_brokers + "}",
-            ),
-            Output(
-                output_prefix + "__bootstrap_brokers_tls",
-                value="${" + msk_cluster.bootstrap_brokers_tls + "}",
-            ),
-            Output(
-                output_prefix + "__bootstrap_brokers_sasl_iam",
-                value="${" + msk_cluster.bootstrap_brokers_sasl_iam + "}",
-            ),
-            Output(
-                output_prefix + "__bootstrap_brokers_sasl_scram",
-                value="${" + msk_cluster.bootstrap_brokers_sasl_scram + "}",
-            ),
-        ]
-        self.add_resources(account, tf_resources)
-
     def populate_saml_idp(self, account_name: str, name: str, metadata: str) -> None:
         saml_idp = aws_iam_saml_provider(
             f"{account_name}-{name}", name=name, saml_metadata_document=metadata