Don't copy unix sockets in atmos describe affected command (#640)

* updates * updates
cloudposse · Jun 27, 2024 · 798bdfb · 798bdfb
1 parent 84bba88
commit 798bdfb
Show file tree

Hide file tree

Showing 16 changed files with 35 additions and 14 deletions.
diff --git a/atmos.yaml b/atmos.yaml
@@ -15,7 +15,7 @@
 # are independent settings (supporting both absolute and relative paths).
 # If 'base_path' is provided, 'components.terraform.base_path', 'components.helmfile.base_path', 'stacks.base_path' and 'workflows.base_path'
 # are considered paths relative to 'base_path'.
-base_path: "./examples/quick-start"
+base_path: "./examples/quick-start-advanced"
 
 components:
   terraform:

diff --git a/examples/quick-start-advanced/Dockerfile b/examples/quick-start-advanced/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.83.0
+ARG ATMOS_VERSION=1.83.1
 
 # Terraform: https://github.com/hashicorp/terraform/releases
 ARG TF_VERSION=1.8.5

diff --git a/examples/tests/atmos.yaml b/examples/tests/atmos.yaml
@@ -347,7 +347,7 @@ schemas:
   atmos:
     # Can also be set using 'ATMOS_SCHEMAS_ATMOS_MANIFEST' ENV var, or '--schemas-atmos-manifest' command-line argument
     # Supports both absolute and relative paths (relative to the `base_path` setting in `atmos.yaml`)
-    manifest: "../quick-start/stacks/schemas/atmos/atmos-manifest/1.0/atmos-manifest.json"
+    manifest: "../quick-start-advanced/stacks/schemas/atmos/atmos-manifest/1.0/atmos-manifest.json"
 
 # CLI command aliases
 aliases:

diff --git a/internal/exec/describe_affected_utils.go b/internal/exec/describe_affected_utils.go
@@ -283,6 +283,16 @@ func ExecuteDescribeAffectedWithTargetRefCheckout(
 			if strings.Contains(src, "node_modules") {
 				return true, nil
 			}
+
+			// Check if the file is a socket and skip it
+			isSocket, err := u.IsSocket(src)
+			if err != nil {
+				return true, err
+			}
+			if isSocket {
+				return true, nil
+			}
+
 			return false, nil
 		},
 	}

diff --git a/pkg/atlantis/atmos.yaml b/pkg/atlantis/atmos.yaml
@@ -330,7 +330,7 @@ schemas:
   atmos:
     # Can also be set using 'ATMOS_SCHEMAS_ATMOS_MANIFEST' ENV var, or '--schemas-atmos-manifest' command-line arguments
     # Supports both absolute and relative paths (relative to the `base_path` setting in `atmos.yaml`)
-    manifest: "../quick-start/stacks/schemas/atmos/atmos-manifest/1.0/atmos-manifest.json"
+    manifest: "../quick-start-advanced/stacks/schemas/atmos/atmos-manifest/1.0/atmos-manifest.json"
 
 # `Go` templates in Atmos manifests
 # https://atmos.tools/core-concepts/stacks/templates

diff --git a/pkg/aws/atmos.yaml b/pkg/aws/atmos.yaml
@@ -330,7 +330,7 @@ schemas:
   atmos:
     # Can also be set using 'ATMOS_SCHEMAS_ATMOS_MANIFEST' ENV var, or '--schemas-atmos-manifest' command-line arguments
     # Supports both absolute and relative paths (relative to the `base_path` setting in `atmos.yaml`)
-    manifest: "../quick-start/stacks/schemas/atmos/atmos-manifest/1.0/atmos-manifest.json"
+    manifest: "../quick-start-advanced/stacks/schemas/atmos/atmos-manifest/1.0/atmos-manifest.json"
 
 # `Go` templates in Atmos manifests
 # https://atmos.tools/core-concepts/stacks/templates

diff --git a/pkg/component/atmos.yaml b/pkg/component/atmos.yaml
@@ -330,7 +330,7 @@ schemas:
   atmos:
     # Can also be set using 'ATMOS_SCHEMAS_ATMOS_MANIFEST' ENV var, or '--schemas-atmos-manifest' command-line arguments
     # Supports both absolute and relative paths (relative to the `base_path` setting in `atmos.yaml`)
-    manifest: "../quick-start/stacks/schemas/atmos/atmos-manifest/1.0/atmos-manifest.json"
+    manifest: "../quick-start-advanced/stacks/schemas/atmos/atmos-manifest/1.0/atmos-manifest.json"
 
 # `Go` templates in Atmos manifests
 # https://atmos.tools/core-concepts/stacks/templates

diff --git a/pkg/describe/atmos.yaml b/pkg/describe/atmos.yaml
@@ -330,7 +330,7 @@ schemas:
   atmos:
     # Can also be set using 'ATMOS_SCHEMAS_ATMOS_MANIFEST' ENV var, or '--schemas-atmos-manifest' command-line arguments
     # Supports both absolute and relative paths (relative to the `base_path` setting in `atmos.yaml`)
-    manifest: "../quick-start/stacks/schemas/atmos/atmos-manifest/1.0/atmos-manifest.json"
+    manifest: "../quick-start-advanced/stacks/schemas/atmos/atmos-manifest/1.0/atmos-manifest.json"
 
 # `Go` templates in Atmos manifests
 # https://atmos.tools/core-concepts/stacks/templates

diff --git a/pkg/generate/atmos.yaml b/pkg/generate/atmos.yaml
@@ -330,7 +330,7 @@ schemas:
   atmos:
     # Can also be set using 'ATMOS_SCHEMAS_ATMOS_MANIFEST' ENV var, or '--schemas-atmos-manifest' command-line arguments
     # Supports both absolute and relative paths (relative to the `base_path` setting in `atmos.yaml`)
-    manifest: "../quick-start/stacks/schemas/atmos/atmos-manifest/1.0/atmos-manifest.json"
+    manifest: "../quick-start-advanced/stacks/schemas/atmos/atmos-manifest/1.0/atmos-manifest.json"
 
 # `Go` templates in Atmos manifests
 # https://atmos.tools/core-concepts/stacks/templates

diff --git a/pkg/spacelift/atmos.yaml b/pkg/spacelift/atmos.yaml
@@ -330,7 +330,7 @@ schemas:
   atmos:
     # Can also be set using 'ATMOS_SCHEMAS_ATMOS_MANIFEST' ENV var, or '--schemas-atmos-manifest' command-line arguments
     # Supports both absolute and relative paths (relative to the `base_path` setting in `atmos.yaml`)
-    manifest: "../quick-start/stacks/schemas/atmos/atmos-manifest/1.0/atmos-manifest.json"
+    manifest: "../quick-start-advanced/stacks/schemas/atmos/atmos-manifest/1.0/atmos-manifest.json"
 
 # `Go` templates in Atmos manifests
 # https://atmos.tools/core-concepts/stacks/templates

diff --git a/pkg/utils/file_utils.go b/pkg/utils/file_utils.go
@@ -1,6 +1,7 @@
 package utils
 
 import (
+	"io/fs"
 	"os"
 	"path"
 	"path/filepath"
@@ -162,3 +163,13 @@ func GetAllYamlFilesInDir(dir string) ([]string, error) {
 
 	return res, nil
 }
+
+// IsSocket checks if a file is a socket
+func IsSocket(path string) (bool, error) {
+	fileInfo, err := os.Stat(path)
+	if err != nil {
+		return false, err
+	}
+	isSocket := fileInfo.Mode().Type() == fs.ModeSocket
+	return isSocket, nil
+}
diff --git a/pkg/validate/atmos.yaml b/pkg/validate/atmos.yaml
@@ -330,7 +330,7 @@ schemas:
   atmos:
     # Can also be set using 'ATMOS_SCHEMAS_ATMOS_MANIFEST' ENV var, or '--schemas-atmos-manifest' command-line arguments
     # Supports both absolute and relative paths (relative to the `base_path` setting in `atmos.yaml`)
-    manifest: "../quick-start/stacks/schemas/atmos/atmos-manifest/1.0/atmos-manifest.json"
+    manifest: "../quick-start-advanced/stacks/schemas/atmos/atmos-manifest/1.0/atmos-manifest.json"
 
 # `Go` templates in Atmos manifests
 # https://atmos.tools/core-concepts/stacks/templates

diff --git a/pkg/validate/validate_stacks_test.go b/pkg/validate/validate_stacks_test.go
@@ -17,7 +17,7 @@ func TestValidateStacksCommand(t *testing.T) {
 }
 
 func TestValidateStacksCommandWithAtmosManifestJsonSchema(t *testing.T) {
-	err := e.ExecuteValidateStacksCmd(cmd.ValidateStacksCmd, []string{"--schemas-atmos-manifest", "../quick-start/stacks/schemas/atmos/atmos-manifest/1.0/atmos-manifest.json"})
+	err := e.ExecuteValidateStacksCmd(cmd.ValidateStacksCmd, []string{"--schemas-atmos-manifest", "../quick-start-advanced/stacks/schemas/atmos/atmos-manifest/1.0/atmos-manifest.json"})
 	u.LogError(err)
 	assert.NotNil(t, err)
 }
diff --git a/pkg/vender/atmos.yaml b/pkg/vender/atmos.yaml
@@ -330,7 +330,7 @@ schemas:
   atmos:
     # Can also be set using 'ATMOS_SCHEMAS_ATMOS_MANIFEST' ENV var, or '--schemas-atmos-manifest' command-line arguments
     # Supports both absolute and relative paths (relative to the `base_path` setting in `atmos.yaml`)
-    manifest: "../quick-start/stacks/schemas/atmos/atmos-manifest/1.0/atmos-manifest.json"
+    manifest: "../quick-start-advanced/stacks/schemas/atmos/atmos-manifest/1.0/atmos-manifest.json"
 
 # `Go` templates in Atmos manifests
 # https://atmos.tools/core-concepts/stacks/templates

diff --git a/pkg/workflow/atmos.yaml b/pkg/workflow/atmos.yaml
@@ -330,7 +330,7 @@ schemas:
   atmos:
     # Can also be set using 'ATMOS_SCHEMAS_ATMOS_MANIFEST' ENV var, or '--schemas-atmos-manifest' command-line arguments
     # Supports both absolute and relative paths (relative to the `base_path` setting in `atmos.yaml`)
-    manifest: "../quick-start/stacks/schemas/atmos/atmos-manifest/1.0/atmos-manifest.json"
+    manifest: "../quick-start-advanced/stacks/schemas/atmos/atmos-manifest/1.0/atmos-manifest.json"
 
 # `Go` templates in Atmos manifests
 # https://atmos.tools/core-concepts/stacks/templates

diff --git a/website/docs/cli/commands/describe/describe-affected.mdx b/website/docs/cli/commands/describe/describe-affected.mdx
@@ -732,7 +732,7 @@ The payload of the HTTP POST request will be a JSON object with the following sc
           {
             "component": "vpc",
             "component_type": "terraform",
-            "component_path": "examples/quick-start/components/terraform/vpc",
+            "component_path": "examples/quick-start-advanced/components/terraform/vpc",
             "stack": "plat-ue2-dev",
             "stack_slug": "plat-ue2-dev-vpc",
             "affected": "stack.vars",