use bearer token for API auth (#369)

* use bearer token for auth * update docs for using API keys with API
kosli-dev · Oct 28, 2024 · c23eac4 · c23eac4
1 parent 6c64d88
commit c23eac4
Show file tree

Hide file tree

Showing 65 changed files with 310 additions and 309 deletions.
diff --git a/cmd/kosli/allowArtifact.go b/cmd/kosli/allowArtifact.go
@@ -85,11 +85,11 @@ func (o *allowArtifactOptions) run(args []string) error {
 	url := fmt.Sprintf("%s/api/v2/allowlists/%s/%s", global.Host, global.Org, o.environmentName)
 
 	reqParams := &requests.RequestParams{
-		Method:   http.MethodPut,
-		URL:      url,
-		Payload:  o.payload,
-		DryRun:   global.DryRun,
-		Password: global.ApiToken,
+		Method:  http.MethodPut,
+		URL:     url,
+		Payload: o.payload,
+		DryRun:  global.DryRun,
+		Token:   global.ApiToken,
 	}
 	_, err := kosliClient.Do(reqParams)
 	if err == nil && !global.DryRun {

diff --git a/cmd/kosli/archiveEnvironment.go b/cmd/kosli/archiveEnvironment.go
@@ -45,11 +45,11 @@ func newArchiveEnvironmentCmd(out io.Writer) *cobra.Command {
 			url := fmt.Sprintf("%s/api/v2/environments/%s/%s/archive", global.Host, global.Org, args[0])
 
 			reqParams := &requests.RequestParams{
-				Method:   http.MethodPut,
-				URL:      url,
-				Payload:  payload,
-				DryRun:   global.DryRun,
-				Password: global.ApiToken,
+				Method:  http.MethodPut,
+				URL:     url,
+				Payload: payload,
+				DryRun:  global.DryRun,
+				Token:   global.ApiToken,
 			}
 			_, err := kosliClient.Do(reqParams)
 			if err == nil && !global.DryRun {

diff --git a/cmd/kosli/archiveFlow.go b/cmd/kosli/archiveFlow.go
@@ -45,11 +45,11 @@ func newArchiveFlowCmd(out io.Writer) *cobra.Command {
 			url := fmt.Sprintf("%s/api/v2/flows/%s/%s/archive", global.Host, global.Org, args[0])
 
 			reqParams := &requests.RequestParams{
-				Method:   http.MethodPut,
-				URL:      url,
-				Payload:  payload,
-				DryRun:   global.DryRun,
-				Password: global.ApiToken,
+				Method:  http.MethodPut,
+				URL:     url,
+				Payload: payload,
+				DryRun:  global.DryRun,
+				Token:   global.ApiToken,
 			}
 			_, err := kosliClient.Do(reqParams)
 			if err == nil && !global.DryRun {

diff --git a/cmd/kosli/assertApproval.go b/cmd/kosli/assertApproval.go
@@ -90,9 +90,9 @@ func (o *assertApprovalOptions) run(args []string) error {
 	url := fmt.Sprintf("%s/api/v2/artifacts/%s/%s/%s/approvals", global.Host, global.Org, o.flowName, o.fingerprint)
 
 	reqParams := &requests.RequestParams{
-		Method:   http.MethodGet,
-		URL:      url,
-		Password: global.ApiToken,
+		Method: http.MethodGet,
+		URL:    url,
+		Token:  global.ApiToken,
 	}
 	response, err := kosliClient.Do(reqParams)
 	if err != nil {

diff --git a/cmd/kosli/assertArtifact.go b/cmd/kosli/assertArtifact.go
@@ -87,9 +87,9 @@ func (o *assertArtifactOptions) run(out io.Writer, args []string) error {
 	url := fmt.Sprintf("%s/api/v2/artifacts/%s/%s/fingerprint/%s", global.Host, global.Org, o.flowName, o.fingerprint)
 
 	reqParams := &requests.RequestParams{
-		Method:   http.MethodGet,
-		URL:      url,
-		Password: global.ApiToken,
+		Method: http.MethodGet,
+		URL:    url,
+		Token:  global.ApiToken,
 	}
 	response, err := kosliClient.Do(reqParams)
 	if err != nil {

diff --git a/cmd/kosli/assertSnapshot.go b/cmd/kosli/assertSnapshot.go
@@ -64,9 +64,9 @@ func run(out io.Writer, args []string) error {
 	url := fmt.Sprintf("%s/api/v2/snapshots/%s/%s/%d", global.Host, global.Org, envName, id)
 
 	reqParams := &requests.RequestParams{
-		Method:   http.MethodGet,
-		URL:      url,
-		Password: global.ApiToken,
+		Method: http.MethodGet,
+		URL:    url,
+		Token:  global.ApiToken,
 	}
 	response, err := kosliClient.Do(reqParams)
 	if err != nil {

diff --git a/cmd/kosli/attachPolicy.go b/cmd/kosli/attachPolicy.go
@@ -69,11 +69,11 @@ func (o *attachPolicyOptions) run(args []string) error {
 		url := fmt.Sprintf("%s/api/v2/environments/%s/%s/policies", global.Host, global.Org, env)
 		o.payload.PolicyNames = []string{args[0]}
 		reqParams := &requests.RequestParams{
-			Method:   http.MethodPost,
-			URL:      url,
-			Payload:  o.payload,
-			DryRun:   global.DryRun,
-			Password: global.ApiToken,
+			Method:  http.MethodPost,
+			URL:     url,
+			Payload: o.payload,
+			DryRun:  global.DryRun,
+			Token:   global.ApiToken,
 		}
 		_, err = kosliClient.Do(reqParams)
 		if err != nil {

diff --git a/cmd/kosli/attestArtifact.go b/cmd/kosli/attestArtifact.go
@@ -199,11 +199,11 @@ func (o *attestArtifactOptions) run(args []string) error {
 	url := fmt.Sprintf("%s/api/v2/artifacts/%s/%s", global.Host, global.Org, o.flowName)
 
 	reqParams := &requests.RequestParams{
-		Method:   http.MethodPost,
-		URL:      url,
-		Payload:  o.payload,
-		DryRun:   global.DryRun,
-		Password: global.ApiToken,
+		Method:  http.MethodPost,
+		URL:     url,
+		Payload: o.payload,
+		DryRun:  global.DryRun,
+		Token:   global.ApiToken,
 	}
 	_, err = kosliClient.Do(reqParams)
 	if err == nil && !global.DryRun {

diff --git a/cmd/kosli/attestGeneric.go b/cmd/kosli/attestGeneric.go
@@ -161,11 +161,11 @@ func (o *attestGenericOptions) run(args []string) error {
 	}
 
 	reqParams := &requests.RequestParams{
-		Method:   http.MethodPost,
-		URL:      url,
-		Form:     form,
-		DryRun:   global.DryRun,
-		Password: global.ApiToken,
+		Method: http.MethodPost,
+		URL:    url,
+		Form:   form,
+		DryRun: global.DryRun,
+		Token:  global.ApiToken,
 	}
 	_, err = kosliClient.Do(reqParams)
 	if err == nil && !global.DryRun {

diff --git a/cmd/kosli/attestJira.go b/cmd/kosli/attestJira.go
@@ -249,11 +249,11 @@ func (o *attestJiraOptions) run(args []string) error {
 	}
 
 	reqParams := &requests.RequestParams{
-		Method:   http.MethodPost,
-		URL:      url,
-		Form:     form,
-		DryRun:   global.DryRun,
-		Password: global.ApiToken,
+		Method: http.MethodPost,
+		URL:    url,
+		Form:   form,
+		DryRun: global.DryRun,
+		Token:  global.ApiToken,
 	}
 	_, err = kosliClient.Do(reqParams)
 	if err == nil && !global.DryRun {

diff --git a/cmd/kosli/attestJunit.go b/cmd/kosli/attestJunit.go
@@ -176,11 +176,11 @@ func (o *attestJunitOptions) run(args []string) error {
 	}
 
 	reqParams := &requests.RequestParams{
-		Method:   http.MethodPost,
-		URL:      url,
-		Form:     form,
-		DryRun:   global.DryRun,
-		Password: global.ApiToken,
+		Method: http.MethodPost,
+		URL:    url,
+		Form:   form,
+		DryRun: global.DryRun,
+		Token:  global.ApiToken,
 	}
 	_, err = kosliClient.Do(reqParams)
 	if err == nil && !global.DryRun {

diff --git a/cmd/kosli/attestSnyk.go b/cmd/kosli/attestSnyk.go
@@ -188,11 +188,11 @@ func (o *attestSnykOptions) run(args []string) error {
 	}
 
 	reqParams := &requests.RequestParams{
-		Method:   http.MethodPost,
-		URL:      url,
-		Form:     form,
-		DryRun:   global.DryRun,
-		Password: global.ApiToken,
+		Method: http.MethodPost,
+		URL:    url,
+		Form:   form,
+		DryRun: global.DryRun,
+		Token:  global.ApiToken,
 	}
 	_, err = kosliClient.Do(reqParams)
 	if err == nil && !global.DryRun {

diff --git a/cmd/kosli/attestSonar.go b/cmd/kosli/attestSonar.go
@@ -190,11 +190,11 @@ func (o *attestSonarOptions) run(args []string) error {
 	}
 
 	reqParams := &requests.RequestParams{
-		Method:   http.MethodPost,
-		URL:      url,
-		Form:     form,
-		DryRun:   global.DryRun,
-		Password: global.ApiToken,
+		Method: http.MethodPost,
+		URL:    url,
+		Form:   form,
+		DryRun: global.DryRun,
+		Token:  global.ApiToken,
 	}
 	_, err = kosliClient.Do(reqParams)
 	if err == nil && !global.DryRun {

diff --git a/cmd/kosli/beginTrail.go b/cmd/kosli/beginTrail.go
@@ -134,11 +134,11 @@ func (o *beginTrailOptions) run(args []string) error {
 	}
 
 	reqParams := &requests.RequestParams{
-		Method:   http.MethodPut,
-		URL:      url,
-		Form:     form,
-		DryRun:   global.DryRun,
-		Password: global.ApiToken,
+		Method: http.MethodPut,
+		URL:    url,
+		Form:   form,
+		DryRun: global.DryRun,
+		Token:  global.ApiToken,
 	}
 
 	res, err := kosliClient.Do(reqParams)

diff --git a/cmd/kosli/createEnvironment.go b/cmd/kosli/createEnvironment.go
@@ -129,11 +129,11 @@ func (o *createEnvOptions) run(args []string) error {
 		o.payload.IncludeScaling = &myFalse
 	}
 	reqParams := &requests.RequestParams{
-		Method:   http.MethodPut,
-		URL:      url,
-		Payload:  o.payload,
-		DryRun:   global.DryRun,
-		Password: global.ApiToken,
+		Method:  http.MethodPut,
+		URL:     url,
+		Payload: o.payload,
+		DryRun:  global.DryRun,
+		Token:   global.ApiToken,
 	}
 	_, err := kosliClient.Do(reqParams)
 	if err == nil && !global.DryRun {

diff --git a/cmd/kosli/createFlow.go b/cmd/kosli/createFlow.go
@@ -120,23 +120,23 @@ func (o *createFlowOptions) run(args []string) error {
 		}
 
 		reqParams = &requests.RequestParams{
-			Method:   http.MethodPut,
-			URL:      url,
-			Form:     form,
-			DryRun:   global.DryRun,
-			Password: global.ApiToken,
+			Method: http.MethodPut,
+			URL:    url,
+			Form:   form,
+			DryRun: global.DryRun,
+			Token:  global.ApiToken,
 		}
 	} else {
 		// legacy flows
 		url = fmt.Sprintf("%s/api/v2/flows/%s", global.Host, global.Org)
 		o.payload.Template = injectArtifactIntoTemplateIfNotExisting(o.payload.Template)
 
 		reqParams = &requests.RequestParams{
-			Method:   http.MethodPut,
-			URL:      url,
-			Payload:  o.payload,
-			DryRun:   global.DryRun,
-			Password: global.ApiToken,
+			Method:  http.MethodPut,
+			URL:     url,
+			Payload: o.payload,
+			DryRun:  global.DryRun,
+			Token:   global.ApiToken,
 		}
 	}
 

diff --git a/cmd/kosli/createPolicy.go b/cmd/kosli/createPolicy.go
@@ -84,11 +84,11 @@ func (o *createPolicyOptions) run(args []string) error {
 	}
 
 	reqParams = &requests.RequestParams{
-		Method:   http.MethodPut,
-		URL:      url,
-		Form:     form,
-		DryRun:   global.DryRun,
-		Password: global.ApiToken,
+		Method: http.MethodPut,
+		URL:    url,
+		Form:   form,
+		DryRun: global.DryRun,
+		Token:  global.ApiToken,
 	}
 
 	res, err := kosliClient.Do(reqParams)

diff --git a/cmd/kosli/detachPolicy.go b/cmd/kosli/detachPolicy.go
@@ -65,11 +65,11 @@ func (o *detachPolicyOptions) run(args []string) error {
 		url := fmt.Sprintf("%s/api/v2/environments/%s/%s/policies", global.Host, global.Org, env)
 		o.payload.PolicyNames = []string{args[0]}
 		reqParams := &requests.RequestParams{
-			Method:   http.MethodDelete,
-			URL:      url,
-			Payload:  o.payload,
-			DryRun:   global.DryRun,
-			Password: global.ApiToken,
+			Method:  http.MethodDelete,
+			URL:     url,
+			Payload: o.payload,
+			DryRun:  global.DryRun,
+			Token:   global.ApiToken,
 		}
 		_, err = kosliClient.Do(reqParams)
 		if err != nil {

diff --git a/cmd/kosli/diffSnapshots.go b/cmd/kosli/diffSnapshots.go
@@ -117,9 +117,9 @@ func (o *diffSnapshotsOptions) run(out io.Writer, args []string) error {
 		global.Host, global.Org, url.QueryEscape(snappish1), url.QueryEscape(snappish2))
 
 	reqParams := &requests.RequestParams{
-		Method:   http.MethodGet,
-		URL:      url,
-		Password: global.ApiToken,
+		Method: http.MethodGet,
+		URL:    url,
+		Token:  global.ApiToken,
 	}
 	response, err := kosliClient.Do(reqParams)
 	if err != nil {

diff --git a/cmd/kosli/disableBeta.go b/cmd/kosli/disableBeta.go
@@ -52,11 +52,11 @@ func (o *betaOptions) run(args []string) error {
 	}
 
 	reqParams := &requests.RequestParams{
-		Method:   http.MethodPut,
-		URL:      url,
-		Payload:  o.payload,
-		DryRun:   global.DryRun,
-		Password: global.ApiToken,
+		Method:  http.MethodPut,
+		URL:     url,
+		Payload: o.payload,
+		DryRun:  global.DryRun,
+		Token:   global.ApiToken,
 	}
 	_, err = kosliClient.Do(reqParams)
 	if err == nil && !global.DryRun {

diff --git a/cmd/kosli/expectDeployment.go b/cmd/kosli/expectDeployment.go
@@ -91,11 +91,11 @@ func (o *expectDeploymentOptions) run(args []string) error {
 	url := fmt.Sprintf("%s/api/v2/deployments/%s/%s", global.Host, global.Org, o.flowName)
 
 	reqParams := &requests.RequestParams{
-		Method:   http.MethodPost,
-		URL:      url,
-		Payload:  o.payload,
-		DryRun:   global.DryRun,
-		Password: global.ApiToken,
+		Method:  http.MethodPost,
+		URL:     url,
+		Payload: o.payload,
+		DryRun:  global.DryRun,
+		Token:   global.ApiToken,
 	}
 	_, err = kosliClient.Do(reqParams)
 	if err == nil && !global.DryRun {

diff --git a/cmd/kosli/getApproval.go b/cmd/kosli/getApproval.go
@@ -78,9 +78,9 @@ func (o *getApprovalOptions) run(out io.Writer, args []string) error {
 	url := fmt.Sprintf("%s/api/v2/approvals/%s/%s/%d", global.Host, global.Org, flowName, id)
 
 	reqParams := &requests.RequestParams{
-		Method:   http.MethodGet,
-		URL:      url,
-		Password: global.ApiToken,
+		Method: http.MethodGet,
+		URL:    url,
+		Token:  global.ApiToken,
 	}
 	response, err := kosliClient.Do(reqParams)
 	if err != nil {

diff --git a/cmd/kosli/getArtifact.go b/cmd/kosli/getArtifact.go
@@ -104,9 +104,9 @@ func (o *getArtifactOptions) run(out io.Writer, args []string) error {
 		url = url + fmt.Sprintf("?trail=%s", o.trail)
 	}
 	reqParams := &requests.RequestParams{
-		Method:   http.MethodGet,
-		URL:      url,
-		Password: global.ApiToken,
+		Method: http.MethodGet,
+		URL:    url,
+		Token:  global.ApiToken,
 	}
 
 	response, err := kosliClient.Do(reqParams)

diff --git a/cmd/kosli/getDeployment.go b/cmd/kosli/getDeployment.go
@@ -79,9 +79,9 @@ func (o *getDeploymentOptions) run(out io.Writer, args []string) error {
 	url := fmt.Sprintf("%s/api/v2/deployments/%s/%s/%d", global.Host, global.Org, flowName, id)
 
 	reqParams := &requests.RequestParams{
-		Method:   http.MethodGet,
-		URL:      url,
-		Password: global.ApiToken,
+		Method: http.MethodGet,
+		URL:    url,
+		Token:  global.ApiToken,
 	}
 	response, err := kosliClient.Do(reqParams)
 	if err != nil {