ACR to System Variable (Azure#41316)

* Removed acr name and grab it from system variables now

* adding version number to pull acr image

* revert last changes

* change name of system variable

---------

Co-authored-by: Tomas Varon <[email protected]>

Author: tvaron3

sdk/cosmos/azure-cosmos-kafka-connect/src/test/connectorPlugins/build.sh

@@ -15,4 +15,4 @@ git clone https://github.com/confluentinc/kafka-connect-insert-uuid.git insertuu
 mvn clean package -DskipTests=true
 cp target/*.jar ../
 cd .. && rm -rf insertuuid
-cd ../
+cd ../

sdk/cosmos/azure-cosmos-kafka-connect/src/test/java/com/azure/cosmos/kafka/connect/KafkaCosmosIntegrationTestSuiteBase.java

@@ -69,14 +69,15 @@ private static void setupDockerContainers() throws IOException, InterruptedExcep
     private static void setupDockerContainersForLocal() {
         logger.info("Setting up local docker containers...");
         network = Network.newNetwork();
-        kafkaContainer = new KafkaContainer(getDockerImageName("kafkaconfluentregistry.azurecr.io/cp-kafka:")
+        kafkaContainer = new KafkaContainer(getDockerImageName(KafkaCosmosTestConfigurations.ACR_NAME + "/cp-kafka:")
             .asCompatibleSubstituteFor("confluentinc/cp-kafka:" + KafkaCosmosTestConfigurations.CONFLUENT_VERSION))
             .withNetwork(network)
             .withNetworkAliases("broker")
             .withStartupTimeout(DEFAULT_CONTAINER_START_UP_TIMEOUT)
             .withLogConsumer(new Slf4jLogConsumer(logger));
 
-        schemaRegistryContainer = new KafkaSchemaRegistryContainer(getDockerImageName("kafkaconfluentregistry.azurecr.io/cp-schema-registry:")
+        schemaRegistryContainer = new KafkaSchemaRegistryContainer(
+            getDockerImageName(KafkaCosmosTestConfigurations.ACR_NAME + "/cp-schema-registry:")
             .asCompatibleSubstituteFor("confluentinc/cp-schema-registry:" + KafkaCosmosTestConfigurations.CONFLUENT_VERSION))
             .withNetwork(network)
             .dependsOn(kafkaContainer)
@@ -86,7 +87,8 @@ private static void setupDockerContainersForLocal() {
 
         Startables.deepStart(Stream.of(kafkaContainer, schemaRegistryContainer)).join();
 
-        kafkaCosmosConnectContainer = new KafkaCosmosConnectContainer(getDockerImageName("kafkaconfluentregistry.azurecr.io/cp-kafka-connect:")
+        kafkaCosmosConnectContainer = new KafkaCosmosConnectContainer(
+            getDockerImageName(KafkaCosmosTestConfigurations.ACR_NAME + "/cp-kafka-connect:")
             .asCompatibleSubstituteFor("confluentinc/cp-kafka-connect:" + KafkaCosmosTestConfigurations.CONFLUENT_VERSION))
             .withNetwork(network)
             .dependsOn(kafkaContainer, schemaRegistryContainer)

sdk/cosmos/azure-cosmos-kafka-connect/src/test/java/com/azure/cosmos/kafka/connect/KafkaCosmosTestConfigurations.java

@@ -33,6 +33,13 @@ public class KafkaCosmosTestConfigurations {
     public static final String DEFAULT_CONNECT_VALUE_CONVERTER = "org.apache.kafka.connect.json.JsonConverter";
     public static final String DEFAULT_CONNECT_PLUGIN_PATH = "/kafka/connect/cosmos-connector";
     public static final String DEFAULT_CONNECT_REST_ADVERTISED_HOST_NAME = "connect";
+    public static final String DEFAULT_ACR_NAME = "confluentinc";
+
+    public final static String ACR_NAME =
+        properties
+            .getProperty(
+                "COSMOS_ACR_NAME",
+                StringUtils.defaultString(Strings.emptyToNull(System.getenv().get("COSMOS_ACR_NAME")), DEFAULT_ACR_NAME));
 
     public final static String MASTER_KEY =
         properties

sdk/cosmos/kafka.yml

@@ -13,6 +13,7 @@ extends:
             ACCOUNT_AAD_CLIENT_SECRET: $(spark-databricks-cosmos-spn-clientSecret)
             COSMOS.CLIENT_TELEMETRY_ENDPOINT: $(cosmos-client-telemetry-endpoint)
             COSMOS.CLIENT_TELEMETRY_COSMOS_ACCOUNT: $(cosmos-client-telemetry-cosmos-account)
+            COSMOS_ACR_NAME: $(kafka-acr-name)
           CloudConfig:
             Public:
               SubscriptionConfigurations:
@@ -37,4 +38,4 @@ extends:
           TestOptions: '$(ProfileFlag) $(AdditionalArgs)'
           AdditionalVariables:
             - name: AdditionalArgs
-              value: ''
+              value: ''