chore: merge release into main

.circleci/config.yml

@@ -107,7 +107,7 @@ executors:
     resource_class: macos.m1.medium.gen1
   win-server2022-amd64:
     machine:
-      image: windows-server-2022-gui:2023.07.1
+      image: windows-server-2022-gui:2024.01.1
     resource_class: windows.large
     shell: powershell
   win-server2019-amd64:

Makefile

@@ -93,7 +93,7 @@ $(BINARY_OUTPUT_FOLDER)/release.json:
 #   We're using this to remove CLIv2 changes in v1's changelogs.
 #   :(exclude) syntax: https://git-scm.com/docs/gitglossary.html#Documentation/gitglossary.txt-exclude
 # Release notes uses version from package.json so we need to prepack beforehand.
-$(BINARY_OUTPUT_FOLDER)/RELEASE_NOTES.md: prepack | $(BINARY_RELEASES_FOLDER_TS_CLI)
+$(BINARY_OUTPUT_FOLDER)/RELEASE_NOTES.md:
 	npx conventional-changelog-cli -l -r 1 -n ./release-scripts/conventional-changelog-cli-config.js > $(BINARY_OUTPUT_FOLDER)/RELEASE_NOTES.md
 
 $(BINARY_OUTPUT_FOLDER)/fips/RELEASE_NOTES.md: $(BINARY_OUTPUT_FOLDER)/RELEASE_NOTES.md $(BINARY_OUTPUT_FOLDER)/fips

binary-releases/RELEASE_NOTES.md

@@ -0,0 +1,12 @@
+# [1.1291.0](https://github.com/snyk/snyk/compare/v1.1290.0...v1.1291.0) (2024-04-30)
+
+The Snyk CLI is being deployed to different deployment channels, users can select the stability level according to their needs. For details please see [this documentation](https://docs.snyk.io/snyk-cli/releases-and-channels-for-the-snyk-cli)
+
+### News
+
+- This is the first **stable release** of the CLI
+- It makes use of semantic versioning and is the successor of [1.1290.0](https://github.com/snyk/cli/releases/tag/v1.1290.0)
+
+### Bug Fixes
+
+- **test:** Fix support of cyclic dependencies in maven with dverbose [#5208](https://github.com/snyk/cli/pull/5208)

cliv2/cmd/cliv2/main.go

@@ -168,9 +168,10 @@ func runWorkflowAndProcessData(engine workflow.Engine, logger *zerolog.Logger, n
 	data, err := engine.Invoke(workflow.NewWorkflowIdentifier(name))
 
 	if err == nil {
-		_, err = engine.InvokeWithInput(localworkflows.WORKFLOWID_OUTPUT_WORKFLOW, data)
+		var output []workflow.Data
+		output, err = engine.InvokeWithInput(localworkflows.WORKFLOWID_OUTPUT_WORKFLOW, data)
 		if err == nil {
-			err = getErrorFromWorkFlowData(data)
+			err = getErrorFromWorkFlowData(output)
 		}
 	} else {
 		logger.Print("Failed to execute the command!", err)

cliv2/cmd/cliv2/main_test.go

@@ -278,30 +278,42 @@ func Test_getErrorFromWorkFlowData(t *testing.T) {
 	})
 }
 
-func addEmptyWorkflows(t *testing.T, engine workflow.Engine, commandList []string) {
-	t.Helper()
-	for _, v := range commandList {
-		fn := func(invocation workflow.InvocationContext, input []workflow.Data) ([]workflow.Data, error) {
-			return []workflow.Data{}, nil
-		}
-
-		workflowConfig := workflow.ConfigurationOptionsFromFlagset(pflag.NewFlagSet("pla", pflag.ContinueOnError))
-		workflowId1 := workflow.NewWorkflowIdentifier(v)
-		_, err := engine.Register(workflowId1, workflowConfig, fn)
-		if err != nil {
-			t.Fatal(err)
-		}
-	}
-}
-
 func Test_runWorkflowAndProcessData(t *testing.T) {
 	defer cleanup()
 	globalConfiguration = configuration.New()
 	globalConfiguration.Set(configuration.DEBUG, true)
 	globalEngine = workflow.NewWorkFlowEngine(globalConfiguration)
 
 	testCmnd := "subcmd1"
-	addEmptyWorkflows(t, globalEngine, []string{"output"})
+	workflowId1 := workflow.NewWorkflowIdentifier("output")
+
+	outputFn := func(invocation workflow.InvocationContext, input []workflow.Data) ([]workflow.Data, error) {
+		summaryPayload, _ := json.Marshal(json_schemas.TestSummary{
+			Results: []json_schemas.TestSummaryResult{{
+				Severity: "critical",
+				Total:    99,
+				Open:     97,
+				Ignored:  2,
+			}, {
+				Severity: "medium",
+				Total:    99,
+				Open:     97,
+				Ignored:  2,
+			}},
+			Type: "sast",
+		})
+		data := workflow.NewData(workflow.NewTypeIdentifier(workflowId1, "workflowData"), content_type.TEST_SUMMARY, summaryPayload)
+		return []workflow.Data{
+			data,
+		}, nil
+	}
+
+	workflowConfig := workflow.ConfigurationOptionsFromFlagset(pflag.NewFlagSet("pla", pflag.ContinueOnError))
+
+	_, err := globalEngine.Register(workflowId1, workflowConfig, outputFn)
+	if err != nil {
+		t.Fatal(err)
+	}
 
 	fn := func(invocation workflow.InvocationContext, input []workflow.Data) ([]workflow.Data, error) {
 		typeId := workflow.NewTypeIdentifier(invocation.GetWorkflowIdentifier(), "workflowData")
@@ -316,7 +328,9 @@ func Test_runWorkflowAndProcessData(t *testing.T) {
 			},
 			Type: "sast",
 		}
-		d, err := json.Marshal(testSummary)
+
+		var d []byte
+		d, err = json.Marshal(testSummary)
 		if err != nil {
 			t.Fatal(err)
 		}
@@ -329,7 +343,6 @@ func Test_runWorkflowAndProcessData(t *testing.T) {
 
 	// setup workflow engine to contain a workflow with subcommands
 	wrkflowId := workflow.NewWorkflowIdentifier(testCmnd)
-	workflowConfig := workflow.ConfigurationOptionsFromFlagset(pflag.NewFlagSet("pla", pflag.ContinueOnError))
 
 	entry, err := globalEngine.Register(wrkflowId, workflowConfig, fn)
 	assert.Nil(t, err)

cliv2/go.mod

@@ -13,7 +13,7 @@ require (
 	github.com/snyk/cli-extension-iac-rules v0.0.0-20240422133948-ae17a4306672
 	github.com/snyk/cli-extension-sbom v0.0.0-20240426130148-b83c2ebc75c4
 	github.com/snyk/container-cli v0.0.0-20240322120441-6d9b9482f9b1
-	github.com/snyk/go-application-framework v0.0.0-20240426112848-21dc9ca24101
+	github.com/snyk/go-application-framework v0.0.0-20240508135435-dbabe7469be4
 	github.com/snyk/go-httpauth v0.0.0-20240307114523-1f5ea3f55c65
 	github.com/snyk/snyk-iac-capture v0.6.5
 	github.com/snyk/snyk-ls v0.0.0-20240507082100-cc93dfb3c69e

cliv2/go.sum

@@ -731,8 +731,8 @@ github.com/snyk/code-client-go v1.5.3 h1:EnHogM2uNnvkrfIJbkOGa9X1bOkU6bJR/QRQCwb
 github.com/snyk/code-client-go v1.5.3/go.mod h1:Kkr7pQc8ItsBZSYd6A1S4r4VHO6HNyTWZsqi18sAtwQ=
 github.com/snyk/container-cli v0.0.0-20240322120441-6d9b9482f9b1 h1:9RKY9NdX5DrJAoVXDP0JiqrXT+4Nb9NH8pjEcA0NsLA=
 github.com/snyk/container-cli v0.0.0-20240322120441-6d9b9482f9b1/go.mod h1:38w+dcAQp9eG3P5t2eNS9eG0reut10AeJjLv5lJ5lpM=
-github.com/snyk/go-application-framework v0.0.0-20240426112848-21dc9ca24101 h1:KNgM4LuGcXcj0WxhAY0TpH20vtGFq9ZxxzGt6rhnZ8c=
-github.com/snyk/go-application-framework v0.0.0-20240426112848-21dc9ca24101/go.mod h1:or9vKR9k7r8CJZ7F5n+SF+r5pMg/PrWAXZXdFdk375M=
+github.com/snyk/go-application-framework v0.0.0-20240508135435-dbabe7469be4 h1:MRULCD+mTn1X33p8wLUxyy6w27aEoD1m4CVScQw0z18=
+github.com/snyk/go-application-framework v0.0.0-20240508135435-dbabe7469be4/go.mod h1:vaYv1/l5tZzVFXtko7wil2yfPaahEMri+QNerrDPRU8=
 github.com/snyk/go-httpauth v0.0.0-20240307114523-1f5ea3f55c65 h1:CEQuYv0Go6MEyRCD3YjLYM2u3Oxkx8GpCpFBd4rUTUk=
 github.com/snyk/go-httpauth v0.0.0-20240307114523-1f5ea3f55c65/go.mod h1:88KbbvGYlmLgee4OcQ19yr0bNpXpOr2kciOthaSzCAg=
 github.com/snyk/policy-engine v0.30.11 h1:wUy5LMar2vccMbNM62MSBRdjAQAhAbIm7aNXXO+g2tk=

dangerfile.js

@@ -4,7 +4,7 @@ const fs = require('fs');
 const MAX_COMMIT_MESSAGE_LENGTH = 72;
 
 function checkCommitMessage(commitMessage, url) {
-  const firstLineRegex = /^(feat|fix|chore|test|docs|refactor|revert)(\([a-z0-9-_]+\))?:(.+)$/;
+  const firstLineRegex = /^Merge.*|(feat|fix|chore|test|docs|refactor|revert)(\([a-z0-9-_]+\))?:(.+)$/;
   if (!firstLineRegex.test(commitMessage)) {
     fail(
       `"[${commitMessage}](${url})" is not using a valid commit message format. For commit guidelines, see: [CONTRIBUTING](https://github.com/snyk/snyk/blob/main/CONTRIBUTING.md#creating-commits).`,