Cr 13423 fix1 (#522)

* changed workflow parameters in demo pipelines

* removed usage of deprecated io/ioutil package to fix lint

Author: daniel-codefresh

Makefile

@@ -1,4 +1,4 @@
-VERSION=v0.0.465
+VERSION=v0.0.466
 
 
 OUT_DIR=dist

cmd/commands/git-source.go

@@ -11,6 +11,7 @@
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
+
 package commands
 
 import (
@@ -242,7 +243,7 @@ func RunGitSourceCreate(ctx context.Context, opts *GitSourceCreateOptions) error
 	}
 
 	if version.LessThan(appProxyGitSourceSupport) {
-		log.G(ctx).Warnf("runtime \"%s\" is using a depracated git-source api. Versions %s and up use the app-proxy for this command. You are using version: %s", opts.RuntimeName, appProxyGitSourceSupport, version.String())
+		log.G(ctx).Warnf("runtime \"%s\" is using a deprecated git-source api. Versions %s and up use the app-proxy for this command. You are using version: %s", opts.RuntimeName, appProxyGitSourceSupport, version.String())
 		return legacyGitSourceCreate(ctx, opts)
 	}
 
@@ -895,8 +896,6 @@ func createDemoGithubTrigger() sensorsv1alpha1.Trigger {
 	})
 	workflowResource := apicommon.NewResource(workflow)
 
-	resultMsgPrefix := "Commit was pushed to branch: "
-
 	return sensorsv1alpha1.Trigger{
 		Template: &sensorsv1alpha1.TriggerTemplate{
 			Name: store.Get().DemoGitTriggerTemplateName,
@@ -907,14 +906,6 @@ func createDemoGithubTrigger() sensorsv1alpha1.Trigger {
 				},
 				Parameters: []sensorsv1alpha1.TriggerParameter{
 					{
-						Src: &sensorsv1alpha1.TriggerParameterSource{
-							DependencyName: store.Get().DemoGitDependencyName,
-							Value:          &resultMsgPrefix,
-						},
-						Dest: "spec.arguments.parameters.0.value",
-					},
-					{
-						Operation: sensorsv1alpha1.TriggerParameterOpAppend,
 						Src: &sensorsv1alpha1.TriggerParameterSource{
 							DependencyName: store.Get().DemoGitDependencyName,
 							DataTemplate:   "{{ trimPrefix \"refs/heads/\" .Input.body.ref }}",
@@ -1017,8 +1008,6 @@ func createDemoBitbucketServerTrigger() sensorsv1alpha1.Trigger {
 	})
 	workflowResource := apicommon.NewResource(workflow)
 
-	resultMsgPrefix := "Commit was pushed to branch: "
-
 	return sensorsv1alpha1.Trigger{
 		Template: &sensorsv1alpha1.TriggerTemplate{
 			Name: store.Get().DemoGitTriggerTemplateName,
@@ -1029,14 +1018,6 @@ func createDemoBitbucketServerTrigger() sensorsv1alpha1.Trigger {
 				},
 				Parameters: []sensorsv1alpha1.TriggerParameter{
 					{
-						Src: &sensorsv1alpha1.TriggerParameterSource{
-							DependencyName: store.Get().DemoGitDependencyName,
-							Value:          &resultMsgPrefix,
-						},
-						Dest: "spec.arguments.parameters.0.value",
-					},
-					{
-						Operation: sensorsv1alpha1.TriggerParameterOpAppend,
 						Src: &sensorsv1alpha1.TriggerParameterSource{
 							DependencyName: store.Get().DemoGitDependencyName,
 							DataTemplate:   "{{ (first .Input.body.changes).ref.displayId }}",
@@ -1139,8 +1120,6 @@ func createDemoGitlabTrigger() sensorsv1alpha1.Trigger {
 	})
 	workflowResource := apicommon.NewResource(workflow)
 
-	resultMsgPrefix := "Commit was pushed to branch: "
-
 	return sensorsv1alpha1.Trigger{
 		Template: &sensorsv1alpha1.TriggerTemplate{
 			Name: store.Get().DemoGitTriggerTemplateName,
@@ -1151,14 +1130,6 @@ func createDemoGitlabTrigger() sensorsv1alpha1.Trigger {
 				},
 				Parameters: []sensorsv1alpha1.TriggerParameter{
 					{
-						Src: &sensorsv1alpha1.TriggerParameterSource{
-							DependencyName: store.Get().DemoGitDependencyName,
-							Value:          &resultMsgPrefix,
-						},
-						Dest: "spec.arguments.parameters.0.value",
-					},
-					{
-						Operation: sensorsv1alpha1.TriggerParameterOpAppend,
 						Src: &sensorsv1alpha1.TriggerParameterSource{
 							DependencyName: store.Get().DemoGitDependencyName,
 							DataTemplate:   "{{ trimPrefix \"refs/heads/\" .Input.body.ref }}",

docs/releases/release_notes.md

@@ -23,7 +23,7 @@ cf version
 
 ```bash
 # download and extract the binary
-curl -L --output - https://github.com/codefresh-io/cli-v2/releases/download/v0.0.465/cf-linux-amd64.tar.gz | tar zx
+curl -L --output - https://github.com/codefresh-io/cli-v2/releases/download/v0.0.466/cf-linux-amd64.tar.gz | tar zx
 
 # move the binary to your $PATH
 mv ./cf-linux-amd64 /usr/local/bin/cf
@@ -36,7 +36,7 @@ cf version
 
 ```bash
 # download and extract the binary
-curl -L --output - https://github.com/codefresh-io/cli-v2/releases/download/v0.0.465/cf-darwin-amd64.tar.gz | tar zx
+curl -L --output - https://github.com/codefresh-io/cli-v2/releases/download/v0.0.466/cf-darwin-amd64.tar.gz | tar zx
 
 # move the binary to your $PATH
 mv ./cf-darwin-amd64 /usr/local/bin/cf

hack/cmd-docs/main.go

@@ -16,7 +16,6 @@ package main
 
 import (
 	"io/fs"
-	"io/ioutil"
 	"log"
 	"os"
 	"path/filepath"
@@ -69,7 +68,7 @@ func replaceHome() error {
 
 		log.Printf("replaced home at: %s", fname)
 
-		err = ioutil.WriteFile(fname, []byte(newstr), 0422)
+		err = os.WriteFile(fname, []byte(newstr), 0422)
 		if err != nil {
 			return err
 		}

hack/license.go

@@ -17,7 +17,7 @@ package main
 import (
 	"flag"
 	"fmt"
-	"io/ioutil"
+	"io"
 	"log"
 	"os"
 	"path/filepath"
@@ -42,7 +42,7 @@ func main() {
 		panic("--year positive int required")
 	}
 
-	d, err := ioutil.ReadFile(licenseFile)
+	d, err := os.ReadFile(licenseFile)
 	die(err)
 
 	license := string(d)
@@ -61,7 +61,7 @@ func main() {
 		die(err)
 		defer f.Close()
 
-		data, err := ioutil.ReadAll(f)
+		data, err := io.ReadAll(f)
 		die(err)
 
 		s := string(data)

manifests/runtime.yaml

@@ -5,7 +5,7 @@ metadata:
   namespace: "{{ namespace }}"
 spec:
   defVersion: 1.0.1
-  version: 0.0.465
+  version: 0.0.466
   bootstrapSpecifier: github.com/codefresh-io/cli-v2/manifests/argo-cd
   components:
     - name: events

pkg/config/config.go

@@ -20,7 +20,6 @@ import (
 	"errors"
 	"fmt"
 	"io"
-	"io/ioutil"
 	"net/http"
 	"os"
 	"path/filepath"
@@ -144,7 +143,7 @@ func (c *Config) Save() error {
 		return err
 	}
 
-	return ioutil.WriteFile(filepath.Join(c.path, configFileName), data, 0644)
+	return os.WriteFile(filepath.Join(c.path, configFileName), data, 0644)
 }
 
 // GetCurrentContext returns current authentication context

pkg/runtime/runtime.go

@@ -17,9 +17,10 @@ package runtime
 import (
 	"context"
 	"fmt"
-	"io/ioutil"
+	"io"
 	"net/http"
 	"net/url"
+	"os"
 	"strconv"
 	"strings"
 	"time"
@@ -98,12 +99,12 @@ func Download(version *semver.Version, name string) (*Runtime, error) {
 		}
 
 		defer res.Body.Close()
-		body, err = ioutil.ReadAll(res.Body)
+		body, err = io.ReadAll(res.Body)
 		if err != nil {
 			return nil, fmt.Errorf("failed to read runtime definition data: %w", err)
 		}
 	} else {
-		body, err = ioutil.ReadFile(store.RuntimeDefURL)
+		body, err = os.ReadFile(store.RuntimeDefURL)
 		if err != nil {
 			return nil, fmt.Errorf("failed to read runtime definition data: %w", err)
 		}

pkg/util/kust/util.go

@@ -16,15 +16,14 @@ package util
 
 import (
 	"fmt"
-	"io/ioutil"
 	"os"
 	"path/filepath"
 
 	"github.com/argoproj-labs/argocd-autopilot/pkg/fs"
 	"github.com/ghodss/yaml"
-	"sigs.k8s.io/kustomize/kyaml/filesys"
 	"sigs.k8s.io/kustomize/api/krusty"
 	kusttypes "sigs.k8s.io/kustomize/api/types"
+	"sigs.k8s.io/kustomize/kyaml/filesys"
 )
 
 var KUSTOMOZATION_FILE_NAME = "kustomization.yaml"
@@ -66,7 +65,7 @@ func WriteKustomization(fs fs.FS, kust *kusttypes.Kustomization, directory strin
 }
 
 func BuildKustomization(k *kusttypes.Kustomization) ([]byte, error) {
-	td, err := ioutil.TempDir(".", "csdp-add-cluster")
+	td, err := os.MkdirTemp(".", "csdp-add-cluster")
 	if err != nil {
 		return nil, err
 	}
@@ -78,7 +77,7 @@ func BuildKustomization(k *kusttypes.Kustomization) ([]byte, error) {
 	}
 
 	kustomizationPath := filepath.Join(td, "kustomization.yaml")
-	if err = ioutil.WriteFile(kustomizationPath, kyaml, 0400); err != nil {
+	if err = os.WriteFile(kustomizationPath, kyaml, 0400); err != nil {
 		return nil, err
 	}
 
@@ -92,4 +91,4 @@ func BuildKustomization(k *kusttypes.Kustomization) ([]byte, error) {
 	}
 
 	return res.AsYaml()
-}
+}