Merge branch 'main' into 1012-ui-fails-silently-when-init-package-is-…

…not-found
zarf-dev · Nov 29, 2022 · ee7878c · ee7878c
2 parents 795e486 + 0194d6e
commit ee7878c
Show file tree

Hide file tree

Showing 19 changed files with 307 additions and 218 deletions.
diff --git a/.github/workflows/auto-assign-to-project.yml b/.github/workflows/auto-assign-to-project.yml
@@ -11,7 +11,7 @@ jobs:
     if: github.event_name == 'issues' && github.event.action == 'opened'
     steps:
       - name: Move issue to Zarf Project
-        uses: actions/add-to-project@v0.3.0
+        uses: actions/add-to-project@v0.4.0
         with:
           project-url: https://github.com/orgs/defenseunicorns/projects/1
           github-token: ${{ secrets. ZARF_ORG_PROJECT_TOKEN }}
diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml
@@ -9,6 +9,7 @@ on:
       - "**.svg"
       - "adr/**"
       - "docs/**"
+      - "CODEOWNERS"
 
 jobs:
   validate:

diff --git a/.github/workflows/scan-codeql.yml b/.github/workflows/scan-codeql.yml
@@ -14,6 +14,7 @@ on:
       - "docs/**"
       - "package.json"
       - "package-lock.json"
+      - "CODEOWNERS"
   schedule:
     - cron: "32 2 * * 5"
 

diff --git a/.github/workflows/test-external.yml b/.github/workflows/test-external.yml
@@ -9,6 +9,7 @@ on:
       - "**.svg"
       - "adr/**"
       - "docs/**"
+      - "CODEOWNERS"      
 
 # Abort prior jobs in the same workflow / PR
 concurrency:

diff --git a/.github/workflows/test-k3d.yml b/.github/workflows/test-k3d.yml
@@ -11,6 +11,7 @@ on:
       - "docs/**"
       - "package.json"
       - "package-lock.json"
+      - "CODEOWNERS"      
 
 # Abort prior jobs in the same workflow / PR
 concurrency:

diff --git a/.github/workflows/test-k3s.yml b/.github/workflows/test-k3s.yml
@@ -11,6 +11,7 @@ on:
       - "docs/**"
       - "package.json"
       - "package-lock.json"
+      - "CODEOWNERS"      
 
 # Abort prior jobs in the same workflow / PR
 concurrency:

diff --git a/.github/workflows/test-kind.yml b/.github/workflows/test-kind.yml
@@ -11,6 +11,7 @@ on:
       - "docs/**"
       - "package.json"
       - "package-lock.json"
+      - "CODEOWNERS"      
 
 # Abort prior jobs in the same workflow / PR
 concurrency:

diff --git a/.github/workflows/test-ui.yml b/.github/workflows/test-ui.yml
@@ -9,6 +9,7 @@ on:
       - "**.svg"
       - "adr/**"
       - "docs/**"
+      - "CODEOWNERS"      
 
 # Abort prior jobs in the same workflow / PR
 concurrency:

diff --git a/.github/workflows/test-windows.yml b/.github/workflows/test-windows.yml
@@ -9,6 +9,7 @@ on:
       - "**.svg"
       - "adr/**"
       - "docs/**"
+      - "CODEOWNERS"      
 
 # Abort prior jobs in the same workflow / PR
 concurrency:

diff --git a/CODEOWNERS b/CODEOWNERS
@@ -1,7 +1,7 @@
 * @defenseunicorns/zarf
 
 # Docs & examples
-/adr/ @JasonvanBrackel @jeff-mccoy @YrrepNoj
+/adr/ @jeff-mccoy @YrrepNoj @Racer159
 /docs/ @Madeline-UX @JasonvanBrackel @RothAndrew @jeff-mccoy @YrrepNoj @Racer159
 /examples/ @JasonvanBrackel @RothAndrew @jeff-mccoy @YrrepNoj @Racer159
 *.md @Madeline-UX @JasonvanBrackel @RothAndrew @jeff-mccoy @YrrepNoj @Racer159
@@ -12,8 +12,8 @@
 main.go @jeff-mccoy @YrrepNoj @Racer159
 
 # Init package
-/packages/ @jeff-mccoy @YrrepNoj @Racer159 @JasonvanBrackel
-/zarf.yaml @jeff-mccoy @YrrepNoj @Racer159 @JasonvanBrackel
+/packages/ @jeff-mccoy @YrrepNoj @Racer159
+/zarf.yaml @jeff-mccoy @YrrepNoj @Racer159
 
 # Web UI-specific 
 /package*.json @mike-winberry @Racer159 @Noxsios @jeff-mccoy @YrrepNoj 

diff --git a/docs/4-user-guide/4-vscode.md b/docs/4-user-guide/4-vscode.md
@@ -15,7 +15,7 @@ The [YAML extension](https://marketplace.visualstudio.com/items?itemName=redhat.
 
 ```json
   "yaml.schemas": {
-    "https://github.com/defenseunicorns/zarf/raw/master/zarf.schema.json": "zarf.yaml"
+    "https://github.com/defenseunicorns/zarf/raw/main/zarf.schema.json": "zarf.yaml"
   }
 ```
 

diff --git a/go.mod b/go.mod
@@ -6,7 +6,7 @@ require (
 	github.com/AlecAivazis/survey/v2 v2.3.6
 	github.com/alecthomas/jsonschema v0.0.0-20220216202328-9eeeec9d044b
 	github.com/anchore/stereoscope v0.0.0-20221006201143-d24c9d626b33
-	github.com/anchore/syft v0.60.3
+	github.com/anchore/syft v0.62.2
 	github.com/derailed/k9s v0.26.7
 	github.com/distribution/distribution/v3 v3.0.0-20220612151901-b5e2f3f33dbc
 	github.com/fatih/color v1.13.0
@@ -19,12 +19,12 @@ require (
 	github.com/mholt/archiver/v3 v3.5.1
 	github.com/otiai10/copy v1.9.0
 	github.com/pkg/errors v0.9.1
-	github.com/pterm/pterm v0.12.49
+	github.com/pterm/pterm v0.12.50
 	github.com/sigstore/cosign v1.13.1
 	github.com/spf13/cobra v1.6.1
 	github.com/spf13/viper v1.14.0
 	github.com/stretchr/testify v1.8.1
-	golang.org/x/crypto v0.2.0
+	golang.org/x/crypto v0.3.0
 	gopkg.in/yaml.v2 v2.4.0
 	helm.sh/helm/v3 v3.10.2
 	k8s.io/api v0.25.4
@@ -296,7 +296,7 @@ require (
 	github.com/sirupsen/logrus v1.9.0 // indirect
 	github.com/skratchdot/open-golang v0.0.0-20200116055534-eef842397966 // indirect
 	github.com/soheilhy/cmux v0.1.5 // indirect
-	github.com/spdx/tools-golang v0.2.0 // indirect
+	github.com/spdx/tools-golang v0.3.1-0.20221108182156-8a01147e6342 // indirect
 	github.com/spf13/afero v1.9.2 // indirect
 	github.com/spf13/cast v1.5.0 // indirect
 	github.com/spf13/jwalterweatherman v1.1.0 // indirect

diff --git a/go.sum b/go.sum
@@ -305,6 +305,12 @@ github.com/anchore/stereoscope v0.0.0-20221006201143-d24c9d626b33 h1:Y+9aMJMTEMH
 github.com/anchore/stereoscope v0.0.0-20221006201143-d24c9d626b33/go.mod h1:WOWtswyDxLkBnizq9LihYa9uw88r1FhBvJo7g//Ljcc=
 github.com/anchore/syft v0.60.3 h1:35mk6LgG8iSbSgRHOwsRr/XyPq0KE0FQPK8LO5RiyAI=
 github.com/anchore/syft v0.60.3/go.mod h1:liCRoNZiQeiZeafaptjizcr/V7+ZAEYra/RhwqKldgw=
+github.com/anchore/syft v0.62.0 h1:eKi0lfcQJVEte6rQSk2ZEU4CYwGWXkOaGtzu9apsfZM=
+github.com/anchore/syft v0.62.0/go.mod h1:aDR91I0K5EHp8oiE3DibOnOajF/A0N2tti46RNTiSrc=
+github.com/anchore/syft v0.62.1 h1:3pIZb+Bm5wBJaKbcy48uW6WrSPdXmtCxScnA9ra2HPQ=
+github.com/anchore/syft v0.62.1/go.mod h1:aDR91I0K5EHp8oiE3DibOnOajF/A0N2tti46RNTiSrc=
+github.com/anchore/syft v0.62.2 h1:4LXWeEIcHMDYnV3O1DR/erveeLqkpcDrC51zhpc+WFI=
+github.com/anchore/syft v0.62.2/go.mod h1:aDR91I0K5EHp8oiE3DibOnOajF/A0N2tti46RNTiSrc=
 github.com/andreyvit/diff v0.0.0-20170406064948-c7f18ee00883/go.mod h1:rCTlJbsFo29Kk6CurOXKm700vrz8f0KW0JNfpkRJY/8=
 github.com/andybalholm/brotli v1.0.1/go.mod h1:loMXtMfwqflxFJPmdbJO0a3KNoPuLBgiu3qAvBg8x/Y=
 github.com/andybalholm/brotli v1.0.4 h1:V7DdXeJtZscaqfNuAdSRuRFzuiKlHSC/Zh3zl9qY3JY=
@@ -1765,6 +1771,8 @@ github.com/pterm/pterm v0.12.36/go.mod h1:NjiL09hFhT/vWjQHSj1athJpx6H8cjpHXNAK5b
 github.com/pterm/pterm v0.12.40/go.mod h1:ffwPLwlbXxP+rxT0GsgDTzS3y3rmpAO1NMjUkGTYf8s=
 github.com/pterm/pterm v0.12.49 h1:qeNm0wTWawy6WhKoY8ZKq6qTXFr0s2UtUyRW0yVztEg=
 github.com/pterm/pterm v0.12.49/go.mod h1:D4OBoWNqAfXkm5QLTjIgjNiMXPHemLJHnIreGUsWzWg=
+github.com/pterm/pterm v0.12.50 h1:53nKg5lLI1kXkvLWq2IQI5rgkPkFzEQsuQjxAb39VlE=
+github.com/pterm/pterm v0.12.50/go.mod h1:79BLm4vos2z+eOoHnDG7ZWuYtLaSStyaspKjGmSoxc4=
 github.com/qur/ar v0.0.0-20130629153254-282534b91770/go.mod h1:SjlYv2m9lpV0UW6K7lDqVJwEIIvSjaHbGk7nIfY8Hxw=
 github.com/rakyll/hey v0.1.4 h1:hhc8GIqHN4+rPFZvkM9lkCQGi7da0sINM83xxpFkbPA=
 github.com/rakyll/hey v0.1.4/go.mod h1:nAOTOo+L52KB9SZq/M6J18kxjto4yVtXQDjU2HgjUPI=
@@ -1870,6 +1878,8 @@ github.com/spaolacci/murmur3 v0.0.0-20180118202830-f09979ecbc72/go.mod h1:JwIasO
 github.com/spdx/gordf v0.0.0-20201111095634-7098f93598fb/go.mod h1:uKWaldnbMnjsSAXRurWqqrdyZen1R7kxl8TkmWk2OyM=
 github.com/spdx/tools-golang v0.2.0 h1:KBNcw7xvVycRWeCWZK/5xQJA+plymW1+rTCs8ekJDro=
 github.com/spdx/tools-golang v0.2.0/go.mod h1:RO4Y3IFROJnz+43JKm1YOrbtgQNljW4gAPpA/sY2eqo=
+github.com/spdx/tools-golang v0.3.1-0.20221108182156-8a01147e6342 h1:6uvaOTv4GeRqQV6O1/znbpziqhctMRLTy3OGeZrNMic=
+github.com/spdx/tools-golang v0.3.1-0.20221108182156-8a01147e6342/go.mod h1:VHzvNsKAfAGqs4ZvwRL+7a0dNsL20s7lGui4K9C0xQM=
 github.com/spf13/afero v1.1.2/go.mod h1:j4pytiNVoe2o6bmDsKpLACNPDBIoEAkihy7loJ1B0CQ=
 github.com/spf13/afero v1.2.2/go.mod h1:9ZxEEn6pIJ8Rxe320qSDBk6AsU0r9pR7Q4OcevTdifk=
 github.com/spf13/afero v1.3.3/go.mod h1:5KUK8ByomD5Ti5Artl0RtHeI5pTF7MIDuXL3yY520V4=
@@ -2261,6 +2271,8 @@ golang.org/x/crypto v0.1.0 h1:MDRAIl0xIo9Io2xV565hzXHw3zVseKrJKodhohM5CjU=
 golang.org/x/crypto v0.1.0/go.mod h1:RecgLatLF4+eUMCP1PoPZQb+cVrJcOPbHkTkbkB9sbw=
 golang.org/x/crypto v0.2.0 h1:BRXPfhNivWL5Yq0BGQ39a2sW6t44aODpfxkWjYdzewE=
 golang.org/x/crypto v0.2.0/go.mod h1:hebNnKkNXi2UzZN1eVRvBB7co0a+JxK6XbPiWVs/3J4=
+golang.org/x/crypto v0.3.0 h1:a06MkbcxBrEFc0w0QIZWXrH/9cCX6KJyWbBOIwAn+7A=
+golang.org/x/crypto v0.3.0/go.mod h1:hebNnKkNXi2UzZN1eVRvBB7co0a+JxK6XbPiWVs/3J4=
 golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
 golang.org/x/exp v0.0.0-20190306152737-a1d7652674e8/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
 golang.org/x/exp v0.0.0-20190510132918-efd6b22b2522/go.mod h1:ZjyILWgesfNpC6sMxTJOJm9Kp84zZh5NQWvqDGG3Qr8=