Merge pull request #6 from sterliakov/bugfix/st-force-virginia-for-token

fix: Require two separate provider configurations

Author: sterliakov

.github/workflows/check.yml

@@ -43,8 +43,6 @@ jobs:
                 GITHUB_TOKEN: ${{ github.token }}
 
         -   uses: pre-commit/[email protected]
-            with:
-                extra_args: --all-files --show-diff-on-failure
 
     test:
         name: Test

.pre-commit-config.yaml

@@ -28,17 +28,16 @@ repos:
         args: [-x, -P, SCRIPTDIR, -S, style]
 
 -   repo: https://github.com/antonbabenko/pre-commit-terraform
-    rev: v1.96.1
+    rev: v1.97.4
     hooks:
-    -   id: terraform_validate
     -   id: terraform_fmt
     -   id: terraform_tflint
     -   id: terraform_docs
         args:
         -   --hook-config=--config-file=.terraform-docs.yml
 
 -   repo: https://github.com/bridgecrewio/checkov.git
-    rev: 3.2.277
+    rev: 3.2.382
     hooks:
     -   id: checkov
         args:
@@ -52,3 +51,8 @@ repos:
         -   examples/
         -   --skip-path
         -   tests/
+
+-   repo: https://github.com/codespell-project/codespell
+    rev: v2.4.1
+    hooks:
+    -   id: codespell

CODE_OF_CONDUCT.md

@@ -58,9 +58,6 @@ representative at an online or offline event.
 
 ## Enforcement
 
-Instances of abusive, harassing, or otherwise unacceptable behavior may be
-reported to the community leaders responsible for enforcement at
-[email protected].
 All complaints will be reviewed and investigated promptly and fairly.
 
 All community leaders are obligated to respect the privacy and security of the

README.md

@@ -29,13 +29,25 @@ but the implementation was significantly rewritten.
 Push a dummy Alpine image to a newly created ECR repository:
 
 ```terraform
+provider "aws" {
+  region = "us-east-2"
+}
+provider "aws" {
+  region = "us-east-1"
+  alias = "aws.virginia"
+}
+
 resource "aws_ecr_repository" "example" {
   name = "example"
 }
 
 module "ecr_repo_image" {
   source  = "sterliakov/ecr-image/aws"
-  version = "0.1.0"
+  version = "0.2.0"
+  providers = {
+    aws.main = aws
+    aws.virginia = aws.virginia
+  }
 
   push_ecr_is_public = false
   push_repo_fqdn     = replace(aws_ecr_repository.example.repository_url, "//.*$/", "") # remove everything after first slash
@@ -46,6 +58,9 @@ module "ecr_repo_image" {
 
 ## NOTES
 
+* This module needs two provider aliases: `aws.main` and `aws.virginia`. They
+  may refer to the same provider. `aws.virginia` must be in `us-east-1` region.
+  `aws.main` should be the provider for region where your repository is located.
 * This module only works under Linux.
 * Destroying this module does not remove the pushed image from the repository. Consider
   setting `force_delete = True` on the `aws_ecr_repository` resource if you
@@ -88,7 +103,8 @@ No outputs.
 
 | Name | Version |
 |------|---------|
-| <a name="provider_aws"></a> [aws](#provider\_aws) | >= 5.40.0 |
+| <a name="provider_aws.main"></a> [aws.main](#provider\_aws.main) | >= 5.40.0 |
+| <a name="provider_aws.virginia"></a> [aws.virginia](#provider\_aws.virginia) | >= 5.40.0 |
 | <a name="provider_terraform"></a> [terraform](#provider\_terraform) | n/a |
 
 ## Requirements

examples/lambda/ecr.tf

@@ -5,7 +5,11 @@ resource "aws_ecr_repository" "example" {
 
 module "ecr_repo_image" {
   source  = "sterliakov/ecr-image/aws"
-  version = "0.1.0"
+  version = "0.2.0"
+  providers = {
+    aws.main     = aws
+    aws.virginia = aws
+  }
 
   push_ecr_is_public = false
   push_repo_fqdn     = replace(aws_ecr_repository.example.repository_url, "//.*$/", "") # remove everything after first slash

main.tf

@@ -1,5 +1,9 @@
-data "aws_ecrpublic_authorization_token" "token" {}
-data "aws_ecr_authorization_token" "token" {}
+data "aws_ecrpublic_authorization_token" "token" {
+  provider = aws.virginia
+}
+data "aws_ecr_authorization_token" "token" {
+  provider = aws.main
+}
 
 locals {
   pull_then_push_path = "${path.module}/scripts/pull_then_push.sh"

tests/simple.tftest.hcl

@@ -13,6 +13,11 @@ run "setup" {
 }
 
 run "execute" {
+  providers = {
+    aws.main = aws
+    aws.virginia = aws
+  }
+
   variables {
     push_repo_fqdn     = replace(run.setup.repo_url, "//.*$/", "") # remove everything after first slash
     push_repo_name     = run.setup.repo_name
@@ -31,6 +36,11 @@ run "verify" {
 }
 
 run "execute_again" {
+  providers = {
+    aws.main = aws
+    aws.virginia = aws
+  }
+
   # Ensure no drift
   variables {
     push_repo_fqdn     = replace(run.setup.repo_url, "//.*$/", "") # remove everything after first slash

versions.tf

@@ -3,8 +3,9 @@ terraform {
 
   required_providers {
     aws = {
-      source  = "hashicorp/aws"
-      version = ">= 5.40.0"
+      source                = "hashicorp/aws"
+      version               = ">= 5.40.0"
+      configuration_aliases = [aws.main, aws.virginia]
     }
   }
 }