upstream changes for argo cd

Author: milldr

src/CHANGELOG.md

@@ -1,3 +1,9 @@
+## Components PR []()
+
+Corrected the spelling of "succeded" to "succeeded" in the `on-deploy-succeded` notification. As a result, the `argocd-repo` component will need to be updated to correct the same spelling in the Argo CD desired state repository application set.
+
+See the [PR for argocd-repo]()
+
 ## Components PR [#905](https://github.com/cloudposse/terraform-aws-components/pull/905)
 
 The `notifications.tf` file has been renamed to `notifications.tf`. Delete `notifications.tf` after vendoring these
@@ -10,22 +16,22 @@ This is a bug fix and feature enhancement update. There are few actions necessar
 ## Upgrade actions
 
 1. Update atmos stack yaml config
-  1. Add `github_default_notifications_enabled: true`
-  2. Add `github_webhook_enabled: true`
-  3. Remove `notifications_triggers`
-  4. Remove `notifications_templates`
-  5. Remove `notifications_notifiers`
+   1. Add `github_default_notifications_enabled: true`
+   2. Add `github_webhook_enabled: true`
+   3. Remove `notifications_triggers`
+   4. Remove `notifications_templates`
+   5. Remove `notifications_notifiers`
 
 ```diff
  components:
-  terraform:
-    argocd:
-      settings:
-        spacelift:
-          workspace_enabled: true
-      metadata:
-        component: eks/argocd
-      vars:
+   terraform:
+     argocd:
+       settings:
+         spacelift:
+           workspace_enabled: true
+       metadata:
+         component: eks/argocd
+       vars:
 +        github_default_notifications_enabled: true
 +        github_webhook_enabled: true
 -        notifications_triggers:
@@ -49,7 +55,7 @@ This is a bug fix and feature enhancement update. There are few actions necessar
 ```
 
 2. Move secrets from `/argocd/notifications/notifiers/service_webhook_github-commit-status/github-token` to
-  `argocd/notifications/notifiers/common/github-token`
+   `argocd/notifications/notifiers/common/github-token`
 
 ```bash
 chamber read -q argocd/notifications/notifiers/service_webhook_github-commit-status github-token | chamber write argocd/notifications/notifiers/common github-token

src/README.md

@@ -0,0 +1,14 @@
+# 'eks/argocd' component vendoring config
+
+# 'component.yaml' in the component folder is processed by the 'atmos' commands
+# 'atmos vendor pull -c eks/argocd' or 'atmos vendor pull --component eks/argocd'
+
+apiVersion: atmos/v1
+kind: ComponentVendorConfig
+spec:
+  source:
+    uri: github.com/cloudposse/terraform-aws-components.git//modules/eks/argocd?ref={{ .Version }}
+    version: 1.532.0
+    included_paths:
+      - "**/**"
+    excluded_paths: []

src/component.yaml

@@ -264,8 +264,8 @@ variable "descriptor_formats" {
     Describe additional descriptors to be output in the `descriptors` output map.
     Map of maps. Keys are names of descriptors. Values are maps of the form
     `{
-      format = string
-      labels = list(string)
+       format = string
+       labels = list(string)
     }`
     (Type is `any` so the map values can later be enhanced to provide additional options.)
     `format` is a Terraform format string to be passed to the `format()` function.

src/context.tf

@@ -51,6 +51,13 @@ locals {
         value = data.aws_ssm_parameter.slack_notifications[0].value
         type  = "string"
       }
+    ] : [],
+    var.github_notifications_app_enabled ? [
+      {
+        name  = "notifications.secret.items.github-privateKey"
+        value = data.aws_ssm_parameter.github_notifications_app_private_key[0].value
+        type  = "string"
+      }
     ] : []
   ))
   regional_service_discovery_domain = "${module.this.environment}.${module.dns_gbl_delegated.outputs.default_domain_name}"