Adding new function to check a full docker image path exists

common/config/environment.go

@@ -137,6 +137,8 @@ type CloudEnv interface {
 	InternalRegistry() string
 	// InternalRegistryImageTagExists returns true if the image tag exists in the internal registry.
 	InternalRegistryImageTagExists(image, tag string) (bool, error)
+	// InternalRegistryFullImagePathExists returns true if the image and tag exists in the internal registry.
+	InternalRegistryFullImagePathExists(fullImagePath string) (bool, error)
 }
 
 func NewCommonEnvironment(ctx *pulumi.Context) (CommonEnvironment, error) {

components/datadog/agent/docker.go

@@ -45,8 +45,18 @@ func NewDockerAgent(e config.Env, vm *remoteComp.Host, manager *docker.Manager,
 		if err != nil {
 			return err
 		}
+
 		defaultAgentParams(params)
 
+		// Check FullImagePath exists in internal registry
+		exists, err := e.InternalRegistryFullImagePathExists(params.FullImagePath)
+		if err != nil {
+			return err
+		}
+		if !exists {
+			return fmt.Errorf("image %q not found in the internal registry", params.FullImagePath)
+		}
+
 		// We can have multiple compose files in compose.
 		composeContents := []docker.ComposeInlineManifest{dockerAgentComposeManifest(params.FullImagePath, e.AgentAPIKey(), params.AgentServiceEnvironment)}
 		composeContents = append(composeContents, params.ExtraComposeManifests...)

components/datadog/dockeragentparams/params.go

@@ -60,17 +60,10 @@ func NewParams(e config.Env, options ...Option) (*Params, error) {
 	}
 
 	if e.PipelineID() != "" && e.CommitSHA() != "" {
-		baseTag := fmt.Sprintf("%s-%s", e.PipelineID(), e.CommitSHA())
-		for _, tag := range []string{baseTag, fmt.Sprintf("%s-jmx", baseTag)} {
-			exists, err := e.InternalRegistryImageTagExists(fmt.Sprintf("%s/agent", e.InternalRegistry()), tag)
-			if err != nil {
-				return nil, err
-			}
-			if !exists {
-				return nil, fmt.Errorf("image %s/agent:%s not found in the internal registry", e.InternalRegistry(), tag)
-			}
-		}
-		options = append(options, WithFullImagePath(utils.BuildDockerImagePath("669783387624.dkr.ecr.us-east-1.amazonaws.com/agent", baseTag)))
+		options = append(options,
+			WithFullImagePath(utils.BuildDockerImagePath(
+				"669783387624.dkr.ecr.us-east-1.amazonaws.com/agent",
+				fmt.Sprintf("%s-%s", e.PipelineID(), e.CommitSHA()))))
 	}
 
 	return common.ApplyOption(version, options)

resources/aws/environment.go

@@ -187,6 +187,22 @@ func (e *Environment) InternalRegistryImageTagExists(image, tag string) (bool, e
 	return true, nil
 }
 
+func (e *Environment) InternalRegistryFullImagePathExists(fullImagePath string) (bool, error) {
+	var image, tag string
+	lastColonIdx := strings.LastIndex(fullImagePath, ":")
+	if lastColonIdx > 0 &&
+		lastColonIdx < len(fullImagePath) &&
+		// Check not part of registry address (e.g., "registry:5000/image")
+		!strings.Contains(fullImagePath[:lastColonIdx], "/") {
+		image = fullImagePath[:lastColonIdx]
+		tag = fullImagePath[lastColonIdx+1:]
+	} else {
+		image = fullImagePath
+		tag = "latest"
+	}
+	return e.InternalRegistryImageTagExists(image, tag)
+}
+
 // Common
 func (e *Environment) Region() string {
 	return e.GetStringWithDefault(e.awsConfig, awsRegionParamName, e.envDefault.aws.region)

resources/azure/environment.go

@@ -84,6 +84,10 @@ func (e *Environment) InternalRegistryImageTagExists(_, _ string) (bool, error)
 	return true, nil
 }
 
+func (e *Environment) InternalRegistryFullImagePathExists(_ string) (bool, error) {
+	return true, nil
+}
+
 // Common
 
 func (e *Environment) DefaultSubscriptionID() string {

resources/gcp/environment.go

@@ -119,6 +119,10 @@ func (e *Environment) InternalRegistryImageTagExists(_, _ string) (bool, error)
 	return true, nil
 }
 
+func (e *Environment) InternalRegistryFullImagePathExists(_ string) (bool, error) {
+	return true, nil
+}
+
 // Common
 
 func (e *Environment) DefaultPublicKeyPath() string {

resources/hyperv/environment.go

@@ -53,6 +53,10 @@ func (e *Environment) InternalRegistryImageTagExists(_, _ string) (bool, error)
 	return true, nil
 }
 
+func (e *Environment) InternalRegistryFullImagePathExists(_ string) (bool, error) {
+	return true, nil
+}
+
 // Common
 func (e *Environment) DefaultPublicKeyPath() string {
 	return e.InfraConfig.Get(DDInfraDefaultPublicKeyPath)

resources/local/environment.go

@@ -53,6 +53,11 @@ func (e *Environment) InternalRegistryImageTagExists(_, _ string) (bool, error)
 	return true, nil
 }
 
+// InternalRegistryFullImagePathExists returns true if the image and tag exists in the internal registry.
+func (e *Environment) InternalRegistryFullImagePathExists(_ string) (bool, error) {
+	return true, nil
+}
+
 // Common
 func (e *Environment) DefaultPublicKeyPath() string {
 	return e.InfraConfig.Get(DDInfraDefaultPublicKeyPath)