Ajsanon/ux updates #80

aahel · 2023-08-29T17:42:41Z

Changes proposed in this PR:

enables pusiing lambda registrator public image to private ecr repo through terraform
https://hashicorp.atlassian.net/browse/NET-256

How I've tested this PR:

test by creating running terraform apply using aws sandbox account. tested with pull_through = false and pull_through=true.

How I expect reviewers to test this PR:

Checklist:

Tests added
CHANGELOG entry added

- removed all provisioners and used providers

cthain

This is looking great!

modules/lambda-registrator/main.tf

modules/lambda-registrator/variables.tf

examples/lambda/README.md

examples/lambda/lambda/variables.tf

cthain

Great work 👍

erichaberkorn · 2023-09-01T18:33:16Z

examples/lambda/variables.tf

@@ -6,9 +6,10 @@ variable "name" {
  type        = string
 }

-variable "ecr_image_uri" {
-  description = "The private ECR image URI for consul-lambda-registrator."
+variable "lambda_registrator_image" {


This looks like a breaking change to me. We should probably mark it as a breaking change in the changelog.

I'm also assuming this breaks the acceptance tests

terraform-aws-consul-lambda/test/acceptance/tests/setup/main.tf

Line 69 in db2b43a

ecr_image_uri = var.ecr_image_uri

I agree. I missed this in my review. We need to open a PR to update the CHANGELOG for this.

erichaberkorn · 2023-09-01T18:41:42Z

modules/lambda-registrator/main.tf

+  target_image = local.ecr_image_uri
+}
+
+resource "null_resource" "push_image" {


We originally didn't include this because it breaks TFC. It looks like this PR only allows using a pull through cache or pushing docker images. This effectively requires TFC users to use the pull through cache approach.

Is this a tradeoff we are ok with?

This reverts commit db2b43a.

* Lambda Reg UX changes to simplify for users * - added pull through cache - removed all provisioners and used providers * bumped lambda_registrator_image tag * fixed terraform fmt * moved providers to examples/lambda providers.tf * fixed provider and other minor fixes * added pull_through var in examples * fixed terraform lint * fix minor fmt issues * review fixes * minor name change * fix tf lint * variable name changes * added changelog --------- Co-authored-by: AJ Sanon <aj.sanon@hashicorp.com>

This reverts commit db2b43a.

* bump version of setup-terraform and remove gotestsum retries * Update SSM Set to allow for Advanced Tier Parameters (#78) * Bump github.com/hashicorp/consul from 1.15.2 to 1.15.3 in /consul-lambda (#75) Bumps [github.com/hashicorp/consul](https://github.com/hashicorp/consul) from 1.15.2 to 1.15.3. - [Release notes](https://github.com/hashicorp/consul/releases) - [Changelog](https://github.com/hashicorp/consul/blob/main/CHANGELOG.md) - [Commits](hashicorp/consul@v1.15.2...v1.15.3) --- updated-dependencies: - dependency-name: github.com/hashicorp/consul dependency-type: direct:production ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Bump google.golang.org/grpc from 1.50.1 to 1.53.0 in /test/acceptance (#79) Bumps [google.golang.org/grpc](https://github.com/grpc/grpc-go) from 1.50.1 to 1.53.0. - [Release notes](https://github.com/grpc/grpc-go/releases) - [Commits](grpc/grpc-go@v1.50.1...v1.53.0) --- updated-dependencies: - dependency-name: google.golang.org/grpc dependency-type: indirect ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Ajsanon/ux updates (#80) * Lambda Reg UX changes to simplify for users * - added pull through cache - removed all provisioners and used providers * bumped lambda_registrator_image tag * fixed terraform fmt * moved providers to examples/lambda providers.tf * fixed provider and other minor fixes * added pull_through var in examples * fixed terraform lint * fix minor fmt issues * review fixes * minor name change * fix tf lint * variable name changes * added changelog --------- Co-authored-by: AJ Sanon <aj.sanon@hashicorp.com> * Revert "Ajsanon/ux updates (#80)" (#81) This reverts commit db2b43a. * Add support for pushing `consul-lambda-registrator` public image to p… (#82) * Add support for pushing `consul-lambda-registrator` public image to private ecr repo through terraform * fmt tf * minor readme fix * addressed review comments * added fixes and fixed acceptance test * updated aws provider version * updated aws provider version * added force_delete to aws_ecr_repository in test * fmt tf * Update modules/lambda-registrator/main.tf Co-authored-by: Chris Thain <32781396+cthain@users.noreply.github.com> * Update modules/lambda-registrator/main.tf Co-authored-by: Chris Thain <32781396+cthain@users.noreply.github.com> * Update modules/lambda-registrator/variables.tf Co-authored-by: Chris Thain <32781396+cthain@users.noreply.github.com> * grouped data sources together * added review changes * add some fixes * test fixes * minor test fix * added default "" to test ecr_image_uri * fmt tf * Update modules/lambda-registrator/main.tf Co-authored-by: Chris Thain <32781396+cthain@users.noreply.github.com> * added validation test * fixed tf fmt and made validation test parallel * removed validation test from basic test * added test case to validate when privateEcrReponame is set * updated enable_auto_publish_ecr_image var description * fixed tf fmt * Update modules/lambda-registrator/variables.tf Co-authored-by: Chris Thain <32781396+cthain@users.noreply.github.com> * changed consul_image version in basic_test --------- Co-authored-by: Chris Thain <32781396+cthain@users.noreply.github.com> * Update to use CRT prepare workflow This update, moves consul-dataplane to use the prepare workflow. This workflow encapsulates several previous workflows, running jobs in parallel to reduce the artifact processing time. See https://hashicorp.atlassian.net/wiki/spaces/RELENG/pages/2489712686/Dec+7th+2022+-+Introducing+the+new+Prepare+workflow for more info. * [COMPLIANCE] Add Copyright and License Headers (#83) Co-authored-by: hashicorp-copywrite[bot] <110428419+hashicorp-copywrite[bot]@users.noreply.github.com> * Bump golang.org/x/net from 0.7.0 to 0.17.0 in /test/acceptance (#85) Bumps [golang.org/x/net](https://github.com/golang/net) from 0.7.0 to 0.17.0. - [Commits](golang/net@v0.7.0...v0.17.0) --- updated-dependencies: - dependency-name: golang.org/x/net dependency-type: indirect ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * NET-7753 - Support for arm64 builds (#90) * support for arm64 init * fix runs on * fix runs on * fix lint-consul-retry * removed arch * add self hosted machine * fix os * fix platform * fix -race * session manager fix * unzip with overwrite flag * fix vpc issue * arm self hosted * remvoed -override * using docker/setup-qemu-action (#91) * using docker/setup-qemu-action * minor fix * minor fix * minor fix * refactor * added emulation to terrafrom-ci * remveod unused env variable * changed working directory for unit tests * not pushing arm image to hashicorpdev * building arm and amd binaries for extension and lambda for acc test * minor workflow fix * temp change * passing arch to lambda funcs * fmt tf * passing arch through preexisting lambda * fix tf * changed lambda runtime * changed lambda binary name bootstrap * fix go build * reverted extension build changes * increased lambda timeout * removed timeout from lambda func * fmt tf * changed lambda handler * updated aws -lambda-go lib * minor refactor * removed unused step matrix strategy and added some comments * setting unique name for private ecr repo * setting arch for buildig registrator image * temp fix * building arm * docker buildx setup * fixed docker build * fix makefile * fix makefile * bumped aws-lambda-go lib version * temp fix * makefile change * test * modifief registrator tf to support arch * added back other tc * increased timeout * changhed timeout * adjusted timeout * increased timeout * bumped consul image version * removed emulation from acc test * fix tf ci * fix tf ci * increased lambda timeout * increade timeout * making registrator amd64 * temp removed arm regist * readded emulation * reverted some changes * restored eralier version of consul * added arm reg * passed arch to reg * tf fmt * removed arch in ecr tf * removed arch * only amd * add max paralle 1 * fix arch * fix makefile * added buildx * added back emulation * max p 1 * only arm * increase timeout * dummy commit to trigger CI * using different docker tga * fix arch in docker tag * docker push correct arch * fix output * fix image tag * fixed arch var * added multiarch build * fmt tf * fix docker build * build fix * increased timeout * skipped test * removed arch unit tests * removed specifying arch in registrator module * removed passing arch to registrator * readded reg arch * fixed p[assing arch * reenabled arm test for autopublish * fmt tf * fixed validation --------- Co-authored-by: aahel <aahel.guha@hashicorp.com> * prerelease version change * updated changelog --------- Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: Chris Thain <chris.m.thain@gmail.com> Co-authored-by: Ryan Eskin <55214537+reskin89@users.noreply.github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: AJ Sanon <aj.sanon@hashicorp.com> Co-authored-by: Chris Thain <32781396+cthain@users.noreply.github.com> Co-authored-by: Sarah Thompson <sthompson@hashicorp.com> Co-authored-by: hashicorp-copywrite[bot] <110428419+hashicorp-copywrite[bot]@users.noreply.github.com> Co-authored-by: Ashesh Vidyut <134911583+absolutelightning@users.noreply.github.com>

sanon-dev and others added 2 commits August 29, 2023 23:10

Lambda Reg UX changes to simplify for users

207007b

- added pull through cache

6239d6f

- removed all provisioners and used providers

aahel requested review from a team and absolutelightning and removed request for a team August 29, 2023 17:42

aahel temporarily deployed to dockerhub/hashicorpdev August 29, 2023 17:44 — with GitHub Actions Inactive

bumped lambda_registrator_image tag

a0c121b

aahel temporarily deployed to dockerhub/hashicorpdev August 29, 2023 18:20 — with GitHub Actions Inactive

fixed terraform fmt

88af71f

aahel temporarily deployed to dockerhub/hashicorpdev August 29, 2023 18:24 — with GitHub Actions Inactive

aahel requested a review from Ganeshrockz August 30, 2023 04:40

aahel self-assigned this Aug 30, 2023

moved providers to examples/lambda providers.tf

9b2b9a5

aahel temporarily deployed to dockerhub/hashicorpdev August 30, 2023 11:10 — with GitHub Actions Inactive

aahel marked this pull request as draft August 30, 2023 13:11

fixed provider and other minor fixes

cbe084d

aahel temporarily deployed to dockerhub/hashicorpdev August 30, 2023 14:20 — with GitHub Actions Inactive

added pull_through var in examples

baa6a03

aahel marked this pull request as ready for review August 30, 2023 14:57

aahel added 2 commits August 30, 2023 20:28

fixed terraform lint

1df2926

fix minor fmt issues

1074f07

aahel temporarily deployed to dockerhub/hashicorpdev August 30, 2023 15:06 — with GitHub Actions Inactive

aahel requested a review from cthain August 30, 2023 15:21

cthain reviewed Aug 30, 2023

View reviewed changes

aahel added 2 commits August 31, 2023 16:11

review fixes

c0b1e34

minor name change

24a0457

aahel requested a review from cthain August 31, 2023 10:50

aahel temporarily deployed to dockerhub/hashicorpdev August 31, 2023 10:50 — with GitHub Actions Inactive

fix tf lint

76e6c91

aahel temporarily deployed to dockerhub/hashicorpdev August 31, 2023 14:00 — with GitHub Actions Inactive

variable name changes

4cda76b

aahel temporarily deployed to dockerhub/hashicorpdev August 31, 2023 14:13 — with GitHub Actions Inactive

cthain approved these changes Aug 31, 2023

View reviewed changes

added changelog

b4fd515

aahel temporarily deployed to dockerhub/hashicorpdev September 1, 2023 05:09 — with GitHub Actions Inactive

aahel merged commit db2b43a into main Sep 1, 2023
15 of 17 checks passed

aahel deleted the ajsanon/ux-updates branch September 1, 2023 05:10

erichaberkorn reviewed Sep 1, 2023

View reviewed changes

aahel added a commit that referenced this pull request Sep 12, 2023

Revert "Ajsanon/ux updates (#80)"

32e42cd

This reverts commit db2b43a.

aahel mentioned this pull request Sep 12, 2023

Revert "Ajsanon/ux updates" #81

Merged

aahel added a commit that referenced this pull request Sep 12, 2023

Revert "Ajsanon/ux updates (#80)" (#81)

5b828b9

This reverts commit db2b43a.

aahel added the consul-india label Dec 27, 2023

aahel added a commit that referenced this pull request Mar 4, 2024

Revert "Ajsanon/ux updates (#80)" (#81)

5d747c9

This reverts commit db2b43a.

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Ajsanon/ux updates #80

Ajsanon/ux updates #80

aahel commented Aug 29, 2023 •

edited

Loading

cthain left a comment

cthain left a comment

erichaberkorn Sep 1, 2023

erichaberkorn Sep 1, 2023

cthain Sep 1, 2023

erichaberkorn Sep 1, 2023

Ajsanon/ux updates #80

Ajsanon/ux updates #80

Conversation

aahel commented Aug 29, 2023 • edited Loading

Changes proposed in this PR:

How I've tested this PR:

How I expect reviewers to test this PR:

Checklist:

cthain left a comment

Choose a reason for hiding this comment

cthain left a comment

Choose a reason for hiding this comment

erichaberkorn Sep 1, 2023

Choose a reason for hiding this comment

erichaberkorn Sep 1, 2023

Choose a reason for hiding this comment

cthain Sep 1, 2023

Choose a reason for hiding this comment

erichaberkorn Sep 1, 2023

Choose a reason for hiding this comment

aahel commented Aug 29, 2023 •

edited

Loading