Fix conflict

.github/workflows/build.yml

@@ -6,39 +6,19 @@ on:
 
   workflow_dispatch:
 
-jobs:
-  build:
-    name: 'Build CLI and attach to GitHub release'
-    runs-on: ubuntu-latest
-    steps:
-      # Checkout the repo
-      - name: 'Checkout'
-        uses: actions/checkout@v4
-        with:
-          fetch-depth: 0
-
-      # Setup Go
-      - name: 'Setup Go'
-        uses: actions/setup-go@v4
-        with:
-          go-version: '1.21'
+concurrency:
+  group: ${{ github.workflow }}
+  cancel-in-progress: false
 
-      # Print Go version
-      - run: go version
-
-      # Build and release
-      - name: Run GoReleaser
-        uses: goreleaser/goreleaser-action@v3
-        with:
-          version: latest
-          args: release --parallelism 2 --rm-dist
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+jobs:
+  release:
+    uses: cloudposse/.github/.github/workflows/shared-release-branches.yml@main
+    secrets: inherit
 
   homebrew:
     name: "Bump Homebrew formula"
     runs-on: ubuntu-latest
-    needs: build
+    needs: release
     steps:
       - uses: mislav/bump-homebrew-formula-action@v3
         with:

.github/workflows/codeql.yml

@@ -2,10 +2,10 @@ name: "CodeQL"
 
 on:
   push:
-    branches: [ "master" ]
+    branches: [ "main" ]
   pull_request:
     # The branches below must be a subset of the branches above
-    branches: [ "master" ]
+    branches: [ "main" ]
   schedule:
     # runs on 19:17 every Tuesday
     - cron: '27 19 * * 2'
@@ -58,6 +58,6 @@ jobs:
     #     ./location_of_script_within_repo/buildscript.sh
 
     - name: Perform CodeQL Analysis
-      uses: github/codeql-action/analyze@v2
+      uses: github/codeql-action/analyze@v3
       with:
         category: "/language:${{matrix.language}}"

.github/workflows/dependabot.yml

@@ -13,4 +13,4 @@ jobs:
         uses: actions/checkout@v4
 
       - name: 'Dependency Review'
-        uses: actions/dependency-review-action@v3
+        uses: actions/dependency-review-action@v4

.github/workflows/test.yml

@@ -5,10 +5,15 @@ on:
     paths-ignore:
       - "README.md"
 
-  release:
-    types: [created]
+  push:
+    branches:
+      - main
+      - release/v*
     paths-ignore:
-      - "README.md"
+      - '.github/**'
+      - 'docs/**'
+      - 'examples/**'
+      - 'test/**'
 
   workflow_dispatch:
 
@@ -19,15 +24,15 @@ jobs:
     runs-on: ubuntu-latest
     timeout-minutes: 5
     steps:
+      - name: Check out code into the Go module directory
+        uses: actions/checkout@v4
+
       - name: Set up Go
-        uses: actions/setup-go@v4
+        uses: actions/setup-go@v5
         with:
-          go-version: "1.21"
+          go-version-file: "go.mod"
         id: go
 
-      - name: Check out code into the Go module directory
-        uses: actions/checkout@v4
-
       - name: Get dependencies
         run: |
           make deps
@@ -47,15 +52,15 @@ jobs:
     runs-on: ubuntu-latest
     timeout-minutes: 15
     steps:
+      - name: Check out code into the Go module directory
+        uses: actions/checkout@v4
+
       - name: Set up Go
-        uses: actions/setup-go@v4
+        uses: actions/setup-go@v5
         with:
-          go-version: "1.21"
+          go-version-file: "go.mod"
         id: go
 
-      - name: Check out code into the Go module directory
-        uses: actions/checkout@v4
-
       - name: Get dependencies
         run: |
           make deps
@@ -64,3 +69,12 @@ jobs:
         timeout-minutes: 10
         run: |
           make testacc
+
+  release:
+    needs: test
+    if: github.event_name == 'push'
+    uses: cloudposse/.github/.github/workflows/shared-go-auto-release.yml@main
+    with:
+      publish: false
+      format: binary
+    secrets: inherit

.github/workflows/website-deploy-prod.yml

@@ -5,7 +5,7 @@ on:
 
   push:
     branches:
-      - master
+      - main
 
 env:
   AWS_REGION: us-east-2

README.md

@@ -1,7 +1,7 @@
 <!-- markdownlint-disable -->
 <a href="https://cpco.io/homepage"><img src=".github/banner.png?raw=true" alt="Project Banner"/></a><br/>
     <p align="right">
-<a href="https://github.com/cloudposse/atmos/releases/latest"><img src="https://img.shields.io/github/release/cloudposse/atmos.svg?style=for-the-badge" alt="Latest Release"/></a><a href="https://github.com/cloudposse/atmos/commits/master/"><img src="https://img.shields.io/github/last-commit/cloudposse/atmos/master?style=for-the-badge" alt="Last Updated"/></a><a href="https://github.com/cloudposse/atmos/actions/workflows/test.yml"><img src="https://img.shields.io/github/actions/workflow/status/cloudposse/atmos/test.yml?style=for-the-badge" alt="Tests"/></a><a href="https://slack.cloudposse.com"><img src="https://slack.cloudposse.com/for-the-badge.svg" alt="Slack Community"/></a></p>
+<a href="https://github.com/cloudposse/atmos/releases/latest"><img src="https://img.shields.io/github/release/cloudposse/atmos.svg?style=for-the-badge" alt="Latest Release"/></a><a href="https://github.com/cloudposse/atmos/commits/main/"><img src="https://img.shields.io/github/last-commit/cloudposse/atmos/main?style=for-the-badge" alt="Last Updated"/></a><a href="https://github.com/cloudposse/atmos/actions/workflows/test.yml"><img src="https://img.shields.io/github/actions/workflow/status/cloudposse/atmos/test.yml?style=for-the-badge" alt="Tests"/></a><a href="https://slack.cloudposse.com"><img src="https://slack.cloudposse.com/for-the-badge.svg" alt="Slack Community"/></a></p>
 <!-- markdownlint-restore -->
 
 <!--

README.yaml

@@ -11,8 +11,8 @@ badges:
     image: https://img.shields.io/github/release/cloudposse/atmos.svg?style=for-the-badge
     url: https://github.com/cloudposse/atmos/releases/latest
   - name: "Last Updated"
-    image: https://img.shields.io/github/last-commit/cloudposse/atmos/master?style=for-the-badge
-    url: https://github.com/cloudposse/atmos/commits/master/
+    image: https://img.shields.io/github/last-commit/cloudposse/atmos/main?style=for-the-badge
+    url: https://github.com/cloudposse/atmos/commits/main/
   - name: Tests
     image: https://img.shields.io/github/actions/workflow/status/cloudposse/atmos/test.yml?style=for-the-badge
     url: https://github.com/cloudposse/atmos/actions/workflows/test.yml

cmd/describe_affected.go

@@ -36,6 +36,7 @@ func init() {
 	describeAffectedCmd.PersistentFlags().String("ssh-key", "", "Path to PEM-encoded private key to clone private repos using SSH: atmos describe affected --ssh-key <path_to_ssh_key>")
 	describeAffectedCmd.PersistentFlags().String("ssh-key-password", "", "Encryption password for the PEM-encoded private key if the key contains a password-encrypted PEM block: atmos describe affected --ssh-key <path_to_ssh_key> --ssh-key-password <password>")
 	describeAffectedCmd.PersistentFlags().Bool("include-spacelift-admin-stacks", false, "Include the Spacelift admin stack of any stack that is affected by config changes: atmos describe affected --include-spacelift-admin-stacks=true")
+	describeAffectedCmd.PersistentFlags().Bool("include-dependents", false, "Include the dependent components and stacks: atmos describe affected --include-dependents=true")
 	describeAffectedCmd.PersistentFlags().Bool("clone-target-ref", false, "Clone the target reference with which to compare the current branch: atmos describe affected --clone-target-ref=true\n"+
 		"If set to 'false' (default), the target reference will be checked out instead\n"+
 		"This requires that the target reference is already cloned by Git, and the information about it exists in the '.git' directory")

cmd/describe_dependents.go

@@ -7,7 +7,7 @@ import (
 	u "github.com/cloudposse/atmos/pkg/utils"
 )
 
-// describeAffectedCmd produces a list of the affected Atmos components and stacks given two Git commits
+// describeDependentsCmd produces a list of Atmos components in Atmos stacks that depend on the provided Atmos component
 var describeDependentsCmd = &cobra.Command{
 	Use:                "dependents",
 	Aliases:            []string{"dependants"},

examples/quick-start/Dockerfile

@@ -6,7 +6,7 @@ ARG GEODESIC_OS=debian
 # https://atmos.tools/
 # https://github.com/cloudposse/atmos
 # https://github.com/cloudposse/atmos/releases
-ARG ATMOS_VERSION=1.77.0
+ARG ATMOS_VERSION=1.78.0
 
 # Terraform: https://github.com/hashicorp/terraform/releases
 ARG TF_VERSION=1.8.4

examples/tests/stacks/catalog/terraform/derived-component-2.yaml

@@ -10,3 +10,9 @@ components:
         enabled: true
         service_1_name: "derived-component-2-service-1"
         service_2_name: "derived-component-2-service-2"
+      settings:
+        depends_on:
+          1:
+            # If the `context` is not provided,
+            # the `component` is from the same Atmos stack as this component
+            component: "derived-component-1"

examples/tests/stacks/catalog/terraform/derived-component-3.yaml

@@ -11,3 +11,9 @@ components:
       vars:
         enabled: true
         service_1_name: "bad-name"
+      settings:
+        depends_on:
+          1:
+            # If the `context` is not provided,
+            # the `component` is from the same Atmos stack as this component
+            component: "derived-component-2"

examples/tests/stacks/catalog/terraform/derived-component-4.yaml

@@ -0,0 +1,19 @@
+import:
+  - catalog/terraform/base-component-4
+
+components:
+  terraform:
+    derived-component-4:
+      metadata:
+        component: "test/test-component"
+        inherits:
+          - base-component-4
+      vars:
+        enabled: true
+        service_1_name: "name4"
+      settings:
+        depends_on:
+          1:
+            # If the `context` is not provided,
+            # the `component` is from the same Atmos stack as this component
+            component: "derived-component-3"

examples/tests/stacks/catalog/terraform/derived-component-5.yaml

@@ -0,0 +1,19 @@
+import:
+  - catalog/terraform/base-component-3
+
+components:
+  terraform:
+    derived-component-5:
+      metadata:
+        component: "test/test-component"
+        inherits:
+          - base-component-3
+      vars:
+        enabled: true
+        service_1_name: "name5"
+      settings:
+        depends_on:
+          1:
+            # If the `context` is not provided,
+            # the `component` is from the same Atmos stack as this component
+            component: "derived-component-3"

examples/tests/stacks/orgs/cp/tenant1/test1/us-east-2.yaml

@@ -18,6 +18,8 @@ import:
   - catalog/terraform/derived-component-1
   - catalog/terraform/derived-component-2
   - catalog/terraform/derived-component-3
+  - catalog/terraform/derived-component-4
+  - catalog/terraform/derived-component-5
 
 components:
   terraform: