feat: pass docker arch to ecr to lambda

builtin/aws/ecr/plugin.proto

@@ -8,4 +8,5 @@ option go_package = "waypoint/builtin/aws/ecr";
 message Image {
  string image = 1;
  string tag = 2;
+ string architecture = 3;
 }

builtin/aws/ecr/registry.go

@@ -228,8 +228,9 @@ func (r *Registry) Push(
  }
 
  return &Image{
- Image: dockerImg.Image,
- Tag: dockerImg.Tag,
+ Image: dockerImg.Image,
+ Tag: dockerImg.Tag,
+ Architecture: dockerImg.Architecture,
  }, nil
 }
 

builtin/aws/lambda/mapper.go

@@ -0,0 +1,19 @@
+package lambda
+
+import (
+ "github.com/aws/aws-sdk-go/service/lambda"
+ "github.com/hashicorp/go-hclog"
+)
+
+// DockerArchitectureMapper maps a docker image architecture to a valid lambda architecture.
+func DockerArchitectureMapper(src string, log hclog.Logger) string {
+ switch src {
+ case "amd64", "x86_64":
+ return lambda.ArchitectureX8664
+ case "arm64", "aarch64":
+ return lambda.ArchitectureArm64
+ default:
+ log.Warn("unsupported docker architecture", "arch", src, "defaulting to:", lambda.ArchitectureX8664)
+ return lambda.ArchitectureX8664
+ }
+}

builtin/aws/lambda/platform.go

@@ -238,7 +238,7 @@ func (p *Platform) Deploy(
 
  architecture := p.config.Architecture
  if architecture == "" {
- architecture = DefaultArchitecture
+ architecture = DockerArchitectureMapper(img.Architecture, log)
  }
 
  step.Done()

builtin/docker/builder.go

@@ -408,6 +408,8 @@ func (b *Builder) Build(
  ui.Output("Image built: %s (%s)", result.Name(), inspect.Architecture,
  terminal.WithSuccessStyle())
 
+ result.Architecture = inspect.Architecture
+
  return result, nil
 }
 

builtin/docker/plugin.proto

@@ -11,6 +11,7 @@ import "google/protobuf/empty.proto";
 message Image {
  string image = 1;
  string tag = 2;
+ string architecture = 6;
 
  // location is where this image is currently. This can be used to
  // determine if the image is pulled or not based on this proto rather

builtin/docker/registry.go

@@ -80,8 +80,9 @@ func (r *Registry) Push(
  log hclog.Logger,
 ) (*Image, error) {
  target := &Image{
- Image: r.config.Image,
- Tag: r.config.Tag,
+ Image: r.config.Image,
+ Tag: r.config.Tag,
+ Architecture: img.Architecture,
  }
  auth := r.config.Auth
  if !r.config.Local {

website/content/partials/components/builder-docker-pull.mdx

@@ -133,6 +133,10 @@ WARNING: be very careful to not leak the authentication information by hardcodin
 
 Output attributes can be used in your `waypoint.hcl` as [variables](/docs/waypoint-hcl/variables) via [`artifact`](/docs/waypoint-hcl/variables/artifact) or [`deploy`](/docs/waypoint-hcl/variables/deploy).
 
+#### architecture
+
+- Type: **string**
+
 #### image
 
 - Type: **string**

website/content/partials/components/builder-docker.mdx

@@ -170,6 +170,10 @@ If buildkit is enabled unused stages will be skipped.
 
 Output attributes can be used in your `waypoint.hcl` as [variables](/docs/waypoint-hcl/variables) via [`artifact`](/docs/waypoint-hcl/variables/artifact) or [`deploy`](/docs/waypoint-hcl/variables/deploy).
 
+#### architecture
+
+- Type: **string**
+
 #### image
 
 - Type: **string**

website/content/partials/components/registry-aws-ecr.mdx

@@ -61,6 +61,10 @@ This defaults to waypoint- then the application name. The repository will be aut
 
 Output attributes can be used in your `waypoint.hcl` as [variables](/docs/waypoint-hcl/variables) via [`artifact`](/docs/waypoint-hcl/variables/artifact) or [`deploy`](/docs/waypoint-hcl/variables/deploy).
 
+#### architecture
+
+- Type: **string**
+
 #### image
 
 - Type: **string**

website/content/partials/components/registry-docker.mdx

@@ -149,6 +149,10 @@ This optional conflicts with encoded_auth and thusly only one can be used at a t
 
 Output attributes can be used in your `waypoint.hcl` as [variables](/docs/waypoint-hcl/variables) via [`artifact`](/docs/waypoint-hcl/variables/artifact) or [`deploy`](/docs/waypoint-hcl/variables/deploy).
 
+#### architecture
+
+- Type: **string**
+
 #### image
 
 - Type: **string**