diff --git a/COVERAGE b/COVERAGE index b52c0d1b77..f3eae4c04a 100644 --- a/COVERAGE +++ b/COVERAGE @@ -1 +1 @@ -41.08 \ No newline at end of file +41.04 diff --git a/cmd/COVERAGE b/cmd/COVERAGE index 0dc0f32d56..b293f64d6c 100644 --- a/cmd/COVERAGE +++ b/cmd/COVERAGE @@ -1 +1 @@ -8.2 \ No newline at end of file +8.0 \ No newline at end of file diff --git a/cmd/get.go b/cmd/get.go index b42589fbc4..0d70bd92a7 100644 --- a/cmd/get.go +++ b/cmd/get.go @@ -77,6 +77,9 @@ var getCmd = &cobra.Command{ tablePrinter = util.NewTablePrinter(headings) tablePrinter.AddRow("Environment", bootstrapConfig.Env) + tablePrinter.AddRow("Docker") + tablePrinter.AddRow(" Target platform", happyConfig.GetTargetContainerPlatform()) + tablePrinter.AddRow(" Container Architecture", util.GetUserContainerPlatform()) tablePrinter.AddRow("TFE", "") tablePrinter.AddRow(" Environment Workspace", fmt.Sprintf("%s/app/%s/workspaces/env-%s", tfeUrl, tfeOrg, bootstrapConfig.Env)) tablePrinter.AddRow(" Stack Workspace", fmt.Sprintf("%s/app/%s/workspaces/%s-%s", tfeUrl, tfeOrg, bootstrapConfig.Env, stackName)) @@ -161,8 +164,22 @@ var getCmd = &cobra.Command{ if len(arnSegments) < 3 { continue } + taskId := arnSegments[len(arnSegments)-1] tablePrinter.AddRow(" ARN", taskArn) + if len(task.Attributes) > 0 { + for _, attribute := range task.Attributes { + if *attribute.Name == "ecs.cpu-architecture" { + arch, err := util.GetSystemContainerPlatform(*attribute.Value) + if err != nil { + return errors.Wrap(err, "unable to get system container platform") + } + tablePrinter.AddRow(" System Architecture", arch) + break + } + } + } + tablePrinter.AddRow(" Status", *task.LastStatus) tablePrinter.AddRow(" Containers") for _, containerDefinition := range taskDefinition.ContainerDefinitions { @@ -184,7 +201,6 @@ var getCmd = &cobra.Command{ } } - tablePrinter.Print() return nil }, diff --git a/go.mod b/go.mod index dd57ec313c..e88f6c80c3 100644 --- a/go.mod +++ b/go.mod @@ -49,7 +49,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/secretsmanager v1.15.4 github.com/aws/aws-sdk-go-v2/service/ssm v1.25.0 github.com/aws/smithy-go v1.11.2 // indirect - github.com/containerd/containerd v1.6.2 // indirect + github.com/containerd/containerd v1.6.2 github.com/davecgh/go-spew v1.1.1 // indirect github.com/docker/distribution v2.8.1+incompatible // indirect github.com/docker/go-connections v0.4.0 // indirect @@ -78,18 +78,18 @@ require ( github.com/morikuni/aec v1.0.0 // indirect github.com/nu7hatch/gouuid v0.0.0-20131221200532-179d4d0c4d8d // indirect github.com/opencontainers/go-digest v1.0.0 // indirect - github.com/opencontainers/image-spec v1.0.2-0.20211117181255-693428a734f5 // indirect + github.com/opencontainers/image-spec v1.0.2-0.20211117181255-693428a734f5 github.com/pmezard/go-difflib v1.0.0 // indirect github.com/rivo/uniseg v0.2.0 // indirect github.com/spf13/pflag v1.0.5 // indirect github.com/tadvi/systray v0.0.0-20190226123456-11a2b8fa57af // indirect - golang.org/x/crypto v0.0.0-20220331220935-ae2d96664a29 // indirect - golang.org/x/net v0.0.0-20220403103023-749bd193bc2b // indirect - golang.org/x/sys v0.0.0-20220406163625-3f8b81556e12 // indirect + golang.org/x/crypto v0.0.0-20220408190544-5352b0902921 // indirect + golang.org/x/net v0.0.0-20220407224826-aac1ed45d8e3 // indirect + golang.org/x/sys v0.0.0-20220408201424-a24fb2fb8a0f // indirect golang.org/x/term v0.0.0-20210927222741-03fcf44c2211 // indirect golang.org/x/text v0.3.7 // indirect golang.org/x/time v0.0.0-20220224211638-0e9765cccd65 // indirect - google.golang.org/genproto v0.0.0-20220407135246-8d918b4c0f5b // indirect + google.golang.org/genproto v0.0.0-20220407144326-9054f6ed7bac // indirect google.golang.org/grpc v1.45.0 // indirect google.golang.org/protobuf v1.28.0 // indirect ) diff --git a/go.sum b/go.sum index 4a6d37a9ba..4f2ea7da0d 100644 --- a/go.sum +++ b/go.sum @@ -248,8 +248,8 @@ golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACk golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/crypto v0.0.0-20211215153901-e495a2d5b3d3/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= -golang.org/x/crypto v0.0.0-20220331220935-ae2d96664a29 h1:tkVvjkPTB7pnW3jnid7kNyAMPVWllTNOf/qKDze4p9o= -golang.org/x/crypto v0.0.0-20220331220935-ae2d96664a29/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= +golang.org/x/crypto v0.0.0-20220408190544-5352b0902921 h1:iU7T1X1J6yxDr0rda54sWGkHgOp5XJrqm79gcNlC2VM= +golang.org/x/crypto v0.0.0-20220408190544-5352b0902921/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE= golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod h1:wehouNa3lNwaWXcvxsM5YxQ5yQlVC4a0KAMCusXpPoU= @@ -269,8 +269,8 @@ golang.org/x/net v0.0.0-20200822124328-c89045814202/go.mod h1:/O7V0waA8r7cgGh81R golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4/go.mod h1:p54w0d4576C0XHj96bSt6lcn1PtDYWL6XObtHCRCNQM= golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= -golang.org/x/net v0.0.0-20220403103023-749bd193bc2b h1:vI32FkLJNAWtGD4BwkThwEy6XS7ZLLMHkSkYfF8M0W0= -golang.org/x/net v0.0.0-20220403103023-749bd193bc2b/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk= +golang.org/x/net v0.0.0-20220407224826-aac1ed45d8e3 h1:EN5+DfgmRMvRUrMGERW2gQl3Vc+Z7ZMnI/xdEpPSf0c= +golang.org/x/net v0.0.0-20220407224826-aac1ed45d8e3/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk= golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= @@ -301,8 +301,8 @@ golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c/go.mod h1:oPkhp1MJrh7nUepCBc golang.org/x/sys v0.0.0-20210806184541-e5e7981a1069/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20210927094055-39ccf1dd6fa6/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220319134239-a9b59b0215f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20220406163625-3f8b81556e12 h1:QyVthZKMsyaQwBTJE04jdNN0Pp5Fn9Qga0mrgxyERQM= -golang.org/x/sys v0.0.0-20220406163625-3f8b81556e12/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20220408201424-a24fb2fb8a0f h1:8w7RhxzTVgUzw/AH/9mUV5q0vMgy40SQRursCcfmkCw= +golang.org/x/sys v0.0.0-20220408201424-a24fb2fb8a0f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/term v0.0.0-20210503060354-a79de5458b56/go.mod h1:tfny5GFUkzUvx4ps4ajbZsCe5lw1metzhBm9T3x7oIY= golang.org/x/term v0.0.0-20210927222741-03fcf44c2211 h1:JGgROgKl9N8DuW20oFS5gxc+lE67/N3FcwmBPMe7ArY= @@ -336,8 +336,8 @@ google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoA google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc= google.golang.org/genproto v0.0.0-20200513103714-09dca8ec2884/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013/go.mod h1:NbSheEEYHJ7i3ixzK3sjbqSGDJWnxyFXZblF3eUsNvo= -google.golang.org/genproto v0.0.0-20220407135246-8d918b4c0f5b h1:3AW6JOOEaupTAfey305izk2PXQTWf4wC6nVHgga3xJs= -google.golang.org/genproto v0.0.0-20220407135246-8d918b4c0f5b/go.mod h1:8w6bsBMX6yCPbAVTeqQHvzxW0EIFigd5lZyahWgyfDo= +google.golang.org/genproto v0.0.0-20220407144326-9054f6ed7bac h1:qSNTkEN+L2mvWcLgJOR+8bdHX9rN/IdU3A1Ghpfb1Rg= +google.golang.org/genproto v0.0.0-20220407144326-9054f6ed7bac/go.mod h1:8w6bsBMX6yCPbAVTeqQHvzxW0EIFigd5lZyahWgyfDo= google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c= google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg= google.golang.org/grpc v1.25.1/go.mod h1:c3i+UQWmh7LiEpx4sFZnkU36qjEYZ0imhYfXVyQciAY= diff --git a/pkg/artifact_builder/COVERAGE b/pkg/artifact_builder/COVERAGE index 8b61c716ff..9dc96132ed 100644 --- a/pkg/artifact_builder/COVERAGE +++ b/pkg/artifact_builder/COVERAGE @@ -1 +1 @@ -79.6 \ No newline at end of file +77.5 \ No newline at end of file diff --git a/pkg/artifact_builder/artifact_builder.go b/pkg/artifact_builder/artifact_builder.go index 3e9cb0c8f8..ad44945a54 100644 --- a/pkg/artifact_builder/artifact_builder.go +++ b/pkg/artifact_builder/artifact_builder.go @@ -14,6 +14,7 @@ import ( backend "github.com/chanzuckerberg/happy/pkg/backend/aws" "github.com/chanzuckerberg/happy/pkg/config" "github.com/chanzuckerberg/happy/pkg/profiler" + "github.com/chanzuckerberg/happy/pkg/util" "github.com/pkg/errors" log "github.com/sirupsen/logrus" ) @@ -192,7 +193,36 @@ func (ab *ArtifactBuilder) RetagImages( func (ab *ArtifactBuilder) Build() error { defer ab.Profiler.AddRuntime(time.Now(), "Build") - return ab.config.DockerComposeBuild() + targetPlatformDefinedInDockerCompose, err := ab.checkTargetPlatformDefinedInDockerCompose() + if err != nil { + return errors.Wrap(err, "unable to check target platform defined in docker-compose") + } + + // If targetPlatformDefinedInDockerCompose is true,it means that target platform matches the one define in happy config, + // and we can skip setting the DOCKER_DEFAULT_PLATFORM env variable on build. + return ab.config.DockerComposeBuild(targetPlatformDefinedInDockerCompose) +} + +func (ab *ArtifactBuilder) checkTargetPlatformDefinedInDockerCompose() (bool, error) { + targetPlatformDefinedInDockerCompose := false + if ab.config.targetContainerPlatform != util.GetUserContainerPlatform() { + log.Warnf("Your local container platform is %s, but we are building images for %s.", util.GetUserContainerPlatform(), ab.config.targetContainerPlatform) + + data, err := ab.config.DockerComposeConfig() + if err != nil { + return false, errors.Wrap(err, "unable to open docker compose file") + } + for serviceName, service := range data.Services { + if service.Platform != "" { + if service.Platform != ab.config.targetContainerPlatform { + // Passing DOCKER_DEFAULT_PLATFORM into the docker process conflicts with the platform specified in the docker-compose.ymml itself + return false, errors.Errorf("Service '%s' has a platform '%s' specified in docker compose file, it is not possible to build the image. Please remove this setting.", serviceName, service.Platform) + } + targetPlatformDefinedInDockerCompose = true + } + } + } + return targetPlatformDefinedInDockerCompose, nil } func (ab *ArtifactBuilder) RegistryLogin(ctx context.Context) error { diff --git a/pkg/artifact_builder/artifact_builder_test.go b/pkg/artifact_builder/artifact_builder_test.go index 19bfdaa9cf..753c0d7859 100644 --- a/pkg/artifact_builder/artifact_builder_test.go +++ b/pkg/artifact_builder/artifact_builder_test.go @@ -91,6 +91,10 @@ func TestCheckTagExists(t *testing.T) { r.NoError(err) err = artifactBuilder.Push([]string{"latest"}) r.NoError(err) + + platformDefinedInDockerCompose, err := artifactBuilder.checkTargetPlatformDefinedInDockerCompose() + r.False(platformDefinedInDockerCompose) + r.NoError(err) } func TestBuildAndPush(t *testing.T) { diff --git a/pkg/artifact_builder/builder_config.go b/pkg/artifact_builder/builder_config.go index b8dcca8933..7912711cca 100644 --- a/pkg/artifact_builder/builder_config.go +++ b/pkg/artifact_builder/builder_config.go @@ -12,9 +12,10 @@ type ServiceBuild struct { } type ServiceConfig struct { - Image string `yaml:"image"` - Build *ServiceBuild `yaml:"build"` - Network map[string]interface{} `yaml:"networks"` + Image string `yaml:"image"` + Build *ServiceBuild `yaml:"build"` + Network map[string]interface{} `yaml:"networks"` + Platform string `yaml:"platform"` } type ConfigData struct { @@ -22,9 +23,10 @@ type ConfigData struct { } type BuilderConfig struct { - composeFile string - composeEnvFile string - dockerRepo string + composeFile string + composeEnvFile string + dockerRepo string + targetContainerPlatform string profile *config.Profile @@ -47,6 +49,7 @@ func (b *BuilderConfig) WithBootstrap(bootstrap *config.Bootstrap) *BuilderConfi func (b *BuilderConfig) WithHappyConfig(happyConfig *config.HappyConfig) *BuilderConfig { b.composeEnvFile = happyConfig.GetDockerComposeEnvFile() b.dockerRepo = happyConfig.GetDockerRepo() + b.targetContainerPlatform = happyConfig.GetTargetContainerPlatform() return b } diff --git a/pkg/artifact_builder/docker_compose.go b/pkg/artifact_builder/docker_compose.go index 3155b86f7e..fe42f1fd0f 100644 --- a/pkg/artifact_builder/docker_compose.go +++ b/pkg/artifact_builder/docker_compose.go @@ -1,28 +1,32 @@ package artifact_builder import ( + "fmt" "os" "os/exec" + "strings" + "github.com/chanzuckerberg/happy/pkg/util" "github.com/pkg/errors" - "github.com/sirupsen/logrus" + log "github.com/sirupsen/logrus" "gopkg.in/yaml.v3" ) type DockerCommand string const ( - DockerCommandConfig DockerCommand = "config" - DockerCommandBuild DockerCommand = "build" + DockerCommandConfig DockerCommand = "config" + DockerCommandBuild DockerCommand = "build" + DockerDefaultPlatformEnvVar string = "DOCKER_DEFAULT_PLATFORM" ) -func (bc *BuilderConfig) DockerComposeBuild() error { - _, err := bc.invokeDockerCompose(DockerCommandBuild) +func (bc *BuilderConfig) DockerComposeBuild(targetPlatformDefinedInDockerCompose bool) error { + _, err := bc.invokeDockerCompose(DockerCommandBuild, targetPlatformDefinedInDockerCompose) return err } func (bc *BuilderConfig) DockerComposeConfig() (*ConfigData, error) { - configDataBytes, err := bc.invokeDockerCompose(DockerCommandConfig) + configDataBytes, err := bc.invokeDockerCompose(DockerCommandConfig, false) if err != nil { return nil, err } @@ -36,7 +40,7 @@ func (bc *BuilderConfig) DockerComposeConfig() (*ConfigData, error) { } // 'docker-compose' was incorporated into 'docker' itself. -func (bc *BuilderConfig) invokeDockerCompose(command DockerCommand) ([]byte, error) { +func (bc *BuilderConfig) invokeDockerCompose(command DockerCommand, targetPlatformDefinedInDockerCompose bool) ([]byte, error) { composeArgs := []string{"docker", "compose", "--file", bc.composeFile} if len(bc.composeEnvFile) > 0 { composeArgs = append(composeArgs, "--env-file", bc.composeEnvFile) @@ -49,6 +53,15 @@ func (bc *BuilderConfig) invokeDockerCompose(command DockerCommand) ([]byte, err envVars = append(envVars, os.Environ()...) envVars = append(envVars, "DOCKER_BUILDKIT=1") + // Specifying platform in the docker compose conflicts with the DOCKER_DEFAULT_PLATFORM env var: + // multiple platforms feature is currently not supported for docker driver. Please switch to a different driver (eg. "docker buildx create --use") + envVars = filterOutTargetPlatformEnv(envVars) + if !targetPlatformDefinedInDockerCompose { + if bc.targetContainerPlatform != util.GetUserContainerPlatform() { + envVars = append(envVars, fmt.Sprintf("%s=%s", DockerDefaultPlatformEnvVar, bc.targetContainerPlatform)) + } + } + docker, err := bc.GetExecutor().LookPath("docker") if err != nil { return nil, errors.Wrap(err, "could not find docker compose in path") @@ -61,7 +74,8 @@ func (bc *BuilderConfig) invokeDockerCompose(command DockerCommand) ([]byte, err Stdin: os.Stdin, Stderr: os.Stderr, } - logrus.Infof("executing: %s", cmd.String()) + log.Infof("executing: %s", cmd.String()) + switch command { case DockerCommandConfig: output, err := bc.GetExecutor().Output(cmd) @@ -72,3 +86,13 @@ func (bc *BuilderConfig) invokeDockerCompose(command DockerCommand) ([]byte, err return []byte{}, errors.Wrap(err, "unable to process docker compose output") } } + +func filterOutTargetPlatformEnv(envVars []string) []string { + filteredEnvVars := []string{} + for _, envVar := range envVars { + if !strings.Contains(envVar, DockerDefaultPlatformEnvVar) { + filteredEnvVars = append(filteredEnvVars, envVar) + } + } + return filteredEnvVars +} diff --git a/pkg/config/COVERAGE b/pkg/config/COVERAGE index b73d36ef4f..43e5f1e6a6 100644 --- a/pkg/config/COVERAGE +++ b/pkg/config/COVERAGE @@ -1 +1 @@ -69.1 \ No newline at end of file +69.7 \ No newline at end of file diff --git a/pkg/config/happy_config.go b/pkg/config/happy_config.go index 342025a3a8..65b6094f89 100644 --- a/pkg/config/happy_config.go +++ b/pkg/config/happy_config.go @@ -12,13 +12,19 @@ import ( "gopkg.in/yaml.v3" ) +const ( + DefaultTargetContainerPlatform string = "linux/amd64" +) + type Environment struct { - AWSProfile *string `yaml:"aws_profile"` - SecretARN string `yaml:"secret_arn"` - TerraformDirectory string `yaml:"terraform_directory"` - DeleteProtected bool `yaml:"delete_protected"` - AutoRunMigrations bool `yaml:"auto_run_migrations"` - TaskLaunchType LaunchType `yaml:"task_launch_type"` + AWSProfile *string `yaml:"aws_profile"` + SecretARN string `yaml:"secret_arn"` + TerraformDirectory string `yaml:"terraform_directory"` + DeleteProtected bool `yaml:"delete_protected"` + AutoRunMigrations bool `yaml:"auto_run_migrations"` + LogGroupPrefix string `yaml:"log_group_prefix"` + TaskLaunchType LaunchType `yaml:"task_launch_type"` + TargetContainerPlatform string `yaml:"target_container_platform"` } type ConfigData struct { @@ -184,6 +190,16 @@ func (s *HappyConfig) TaskLaunchType() LaunchType { return taskLaunchType } +func (s *HappyConfig) GetTargetContainerPlatform() string { + envConfig := s.getEnvConfig() + + if len(strings.TrimSpace(envConfig.TargetContainerPlatform)) == 0 { + return DefaultTargetContainerPlatform + } + + return envConfig.TargetContainerPlatform +} + func (s *HappyConfig) TerraformVersion() string { return s.getData().TerraformVersion } diff --git a/pkg/config/happy_config_test.go b/pkg/config/happy_config_test.go index 94c82e1d87..831fb091d5 100644 --- a/pkg/config/happy_config_test.go +++ b/pkg/config/happy_config_test.go @@ -24,10 +24,11 @@ func TestNewHappConfig(t *testing.T) { {"prod", aws.String("test-prod"), "happy/env-prod-config", ".happy/terraform/envs/prod", "FARGATE", false}, } + r := require.New(t) + + targetPlatforms := map[string]bool{} for idx, testCase := range testData { t.Run(fmt.Sprintf("%d", idx), func(t *testing.T) { - r := require.New(t) - config, err := NewTestHappyConfig(t, testFilePath, testCase.env) r.NoError(err) @@ -50,8 +51,11 @@ func TestNewHappConfig(t *testing.T) { r.Equal(testCase.wantSecretArn, val) val = config.TaskLaunchType().String() r.Equal(testCase.wantTaskLaunchType, val) + targetPlatforms[config.GetTargetContainerPlatform()] = true }) } + + r.Len(targetPlatforms, 2) } func TestProfile(t *testing.T) { diff --git a/pkg/config/testdata/test_config.yaml b/pkg/config/testdata/test_config.yaml index d12d3f209b..7f1f819cdf 100644 --- a/pkg/config/testdata/test_config.yaml +++ b/pkg/config/testdata/test_config.yaml @@ -33,6 +33,7 @@ environments: auto_run_migrations: false log_group_prefix: "/dp/staging" task_launch_type: fargate + target_container_platform: linux/amd64 prod: aws_profile: "test-prod" secret_arn: "happy/env-prod-config" @@ -41,6 +42,7 @@ environments: auto_run_migrations: false log_group_prefix: "/dp/prod" task_launch_type: fargate + target_container_platform: linux/arm64 tasks: migrate: - "migrate_db_task_definition_arn" diff --git a/pkg/util/COVERAGE b/pkg/util/COVERAGE index dc5f93c327..3781c4d349 100644 --- a/pkg/util/COVERAGE +++ b/pkg/util/COVERAGE @@ -1 +1 @@ -61.3 \ No newline at end of file +64.2 \ No newline at end of file diff --git a/pkg/util/executor_test.go b/pkg/util/executor_test.go index 603e1860df..6ebe3a3121 100644 --- a/pkg/util/executor_test.go +++ b/pkg/util/executor_test.go @@ -20,6 +20,9 @@ func TestExecutor(t *testing.T) { cmd = exec.CommandContext(context.Background(), execPath) _, err = executor.Output(cmd) r.NoError(err) + found, err := executor.LookPath("foobar") + r.NoError(err) + r.NotEmpty(found) executor = NewDefaultExecutor() err = executor.Run(cmd) @@ -27,4 +30,6 @@ func TestExecutor(t *testing.T) { cmd = exec.CommandContext(context.Background(), execPath) _, err = executor.Output(cmd) r.NoError(err) + _, err = executor.LookPath("foobar") + r.Error(err) } diff --git a/pkg/util/platform.go b/pkg/util/platform.go new file mode 100644 index 0000000000..4dc5750493 --- /dev/null +++ b/pkg/util/platform.go @@ -0,0 +1,31 @@ +package util + +import ( + "github.com/containerd/containerd/platforms" + v1 "github.com/opencontainers/image-spec/specs-go/v1" + "github.com/pkg/errors" +) + +// All docker runtimes run images of linux/amd64 or linux/arm64 architecture -- even on darwin or windows. +// To see all supported runtimes on your machine, run: docker buildx ls +func normalizeContainerPlatfrom(platform v1.Platform) v1.Platform { + platform.OS = "linux" + return platforms.Normalize(platform) +} + +func getUserContainerPlatform() v1.Platform { + platform := platforms.DefaultSpec() + return normalizeContainerPlatfrom(platform) +} + +func GetSystemContainerPlatform(architecture string) (string, error) { + platform, err := platforms.Parse(architecture) + if err != nil { + return "", errors.Wrap(err, "unable to parse architecture") + } + return platforms.Format(normalizeContainerPlatfrom(platform)), nil +} + +func GetUserContainerPlatform() string { + return platforms.Format(getUserContainerPlatform()) +} diff --git a/pkg/util/platform_test.go b/pkg/util/platform_test.go new file mode 100644 index 0000000000..10edb2ae4f --- /dev/null +++ b/pkg/util/platform_test.go @@ -0,0 +1,23 @@ +package util + +import ( + "testing" + + "github.com/stretchr/testify/require" +) + +func TestContainerPlatformParsing(t *testing.T) { + r := require.New(t) + + r.NotEmpty(getUserContainerPlatform()) + r.NotEmpty(GetUserContainerPlatform()) + + sourceArch := []string{"x86_64", "x86-64", "aarch64", "linux/amd64", "linux/arm64"} + targetArch := []string{"linux/amd64", "linux/amd64", "linux/arm64", "linux/amd64", "linux/arm64"} + + for index, arch := range sourceArch { + plat, err := GetSystemContainerPlatform(arch) + r.NoError(err) + r.Equal(targetArch[index], plat) + } +}