Merge branch 'main' into renovate/cloudposse-datadog-lambda-forwarder-aws-1.x

Author: goruha

.github/CODEOWNERS

@@ -3,23 +3,14 @@
 #
 # Order is important: the last matching pattern has the highest precedence
 
-# These owners will be the default owners for everything
-*             @cloudposse-terraform-components/engineering @cloudposse-terraform-components/contributors
-
 # Cloud Posse must review any changes to Makefiles
 **/Makefile   @cloudposse-terraform-components/engineering
 **/Makefile.* @cloudposse-terraform-components/engineering
 
-# Cloud Posse must review any changes to GitHub actions
-.github/*     @cloudposse-terraform-components/engineering
-
-# Cloud Posse must review any changes to standard context definition,
-# but some changes can be rubber-stamped.
-**/*.tf       @cloudposse-terraform-components/engineering @cloudposse-terraform-components/contributors @cloudposse-terraform-components/approvers
-README.yaml   @cloudposse-terraform-components/engineering @cloudposse-terraform-components/contributors @cloudposse-terraform-components/approvers
-README.md     @cloudposse-terraform-components/engineering @cloudposse-terraform-components/contributors @cloudposse-terraform-components/approvers
-docs/*.md     @cloudposse-terraform-components/engineering @cloudposse-terraform-components/contributors @cloudposse-terraform-components/approvers
+# Cloud Posse must review any changes to pre-commit configuration
+.pre-commit-config.yaml @cloudposse-terraform-components/engineering
 
-# Cloud Posse Admins must review all changes to CODEOWNERS or the mergify configuration
+# Cloud Posse Admins must review all changes to CODEOWNERS, github configuration or the mergify configuration
+.github/*           @cloudposse-terraform-components/admins
 .github/mergify.yml @cloudposse-terraform-components/admins
 .github/CODEOWNERS  @cloudposse-terraform-components/admins

.github/settings.yml

@@ -5,3 +5,12 @@ repository:
   description: This component is responsible for provision all the necessary infrastructure to deploy Datadog Lambda forwarders
   homepage: https://cloudposse.com/accelerate
   topics: terraform, terraform-component
+
+
+
+
+
+
+
+
+

.github/workflows/automerge.yml

@@ -0,0 +1,20 @@
+name: auto merge
+on:
+  workflow_dispatch:
+    inputs:
+      pr_number:
+        description: 'PR number'
+        required: true
+        type: string
+
+permissions:
+  pull-requests: write
+  id-token: write
+  contents: write
+
+jobs:
+  automerge:
+    uses: cloudposse-terraform-components/.github/.github/workflows/shared-auto-merge.yml@main
+    with:
+      pr_number: ${{ inputs.pr_number }}
+    secrets: inherit

.github/workflows/branch.yml

@@ -5,14 +5,16 @@ on:
     branches:
       - main
       - release/**
-    types: [opened, synchronize, reopened, labeled, unlabeled]
+    types: [opened, synchronize, reopened]
   push:
     branches:
       - main
       - release/v*
     paths-ignore:
       - '.github/**'
       - 'test/**'
+  merge_group:
+    types: [checks_requested]
 
 permissions:
   contents: write

src/main.tf

@@ -12,8 +12,8 @@ locals {
         lookup(v, "name_prefix", "/aws/"),
         module.log_group_prefix.id,
         module.log_group_prefix.delimiter,
-        lookup(v, "name_suffix")
-      ) : lookup(v, "name")
+        v["name_suffix"]
+      ) : v["name"]
       filter_pattern : lookup(v, "filter_pattern", "")
     }
   }

src/provider-datadog.tf

@@ -1,5 +1,5 @@
 module "datadog_configuration" {
-  source                  = "../datadog-configuration/modules/datadog_keys"
+  source                  = "github.com/cloudposse-terraform-components/aws-datadog-credentials?ref=tags/v1.535.1"
   enabled                 = true
   context                 = module.this.context
   global_environment_name = var.datadog_configuration_environment