Add support for --delete in push all command (#267)

* extracting to a single client

* configure client base URL and base headers at the source

* fix typo

* remove individual delete flag in favor of persistent flag

* remove debug flag

* fix lint and bump libs

* try to bump go lint

* fix binary reference

* fix lint

* fix tests

Author: vitorvezani

.circleci/config.yml

@@ -19,7 +19,7 @@ jobs:
     resource_class: large
     docker:
       # Note the goreleaser version is also referenced in the release and snapshot jobs.
-      - image: goreleaser/goreleaser:v2.10.2
+      - image: goreleaser/goreleaser:v2.11.2
     steps:
       - checkout
       - run:
@@ -31,8 +31,8 @@ jobs:
               echo "$output"
               exit 1
             fi
-            go install github.com/golangci/golangci-lint/cmd/golangci-lint@v1.63.4
-            golangci-lint run -v --timeout 2m0s
+            wget -O- -nv https://raw.githubusercontent.com/golangci/golangci-lint/HEAD/install.sh | sh -s v2.3.1
+            ./bin/golangci-lint run -v --timeout 2m0s
       - run: ./.circleci/scripts/e2e-env.sh
       - *install_vault
       - rok8s/get_vault_env:
@@ -47,7 +47,7 @@ jobs:
     resource_class: large
     docker:
       # Note the goreleaser version is also referenced in the release and test jobs.
-      - image: goreleaser/goreleaser:v2.10.2
+      - image: goreleaser/goreleaser:v2.11.2
     steps:
       - checkout
       - setup_remote_docker:
@@ -63,7 +63,7 @@ jobs:
     shell: /bin/bash
     docker:
       # Note the goreleaser version is also referenced in the snapshot and test jobs.
-      - image: goreleaser/goreleaser:v2.10.2
+      - image: goreleaser/goreleaser:v2.11.2
     steps:
       - checkout
       - run: ./.circleci/scripts/e2e-env.sh
@@ -73,8 +73,8 @@ jobs:
       - rok8s/get_vault_env:
           vault_path: repo/insights-cli/env
       - run: |
-              go install github.com/golangci/golangci-lint/cmd/golangci-lint@v1.63.4
-              golangci-lint run -v --timeout 2m0s
+              wget -O- -nv https://raw.githubusercontent.com/golangci/golangci-lint/HEAD/install.sh | sh -s v2.3.1
+              ./bin/golangci-lint run -v --timeout 2m0s
               go test -tags e2e ./pkg/...
       - setup_remote_docker:
           version: docker24

.gitignore

@@ -14,4 +14,6 @@
 # Dependency directories (remove the comment below to include it)
 # vendor/
 main
-insights-cli
+insights-cli
+
+.tool-versions

go.mod

@@ -2,13 +2,15 @@ module github.com/fairwindsops/insights-cli
 
 go 1.24.4
 
+toolchain go1.24.5
+
 require (
-	github.com/fairwindsops/insights-plugins/plugins/opa v0.0.0-20250715140540-2403ef57f5b0
+	github.com/fairwindsops/insights-plugins/plugins/opa v0.0.0-20250731170703-4746d9c4a102
 	github.com/fatih/color v1.18.0
 	github.com/google/go-cmp v0.7.0
 	github.com/hashicorp/go-multierror v1.1.1
 	github.com/imroc/req/v3 v3.54.0
-	github.com/open-policy-agent/opa v1.6.0
+	github.com/open-policy-agent/opa v1.7.1
 	github.com/rogpeppe/go-internal v1.14.1
 	github.com/samber/lo v1.51.0
 	github.com/sirupsen/logrus v1.9.3
@@ -19,7 +21,7 @@ require (
 	gopkg.in/yaml.v2 v2.4.0
 	gopkg.in/yaml.v3 v3.0.1
 	k8s.io/apimachinery v0.33.3
-	sigs.k8s.io/yaml v1.5.0
+	sigs.k8s.io/yaml v1.6.0
 )
 
 require (
@@ -29,7 +31,6 @@ require (
 	github.com/cespare/xxhash/v2 v2.3.0 // indirect
 	github.com/cloudflare/circl v1.6.1 // indirect
 	github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
-	github.com/dgraph-io/badger/v4 v4.8.0 // indirect
 	github.com/emicklei/go-restful/v3 v3.12.2 // indirect
 	github.com/evanphx/json-patch/v5 v5.9.11 // indirect
 	github.com/fsnotify/fsnotify v1.9.0 // indirect
@@ -70,20 +71,15 @@ require (
 	github.com/quic-go/quic-go v0.53.0 // indirect
 	github.com/rcrowley/go-metrics v0.0.0-20250401214520-65e299d6c5c9 // indirect
 	github.com/refraction-networking/utls v1.7.3 // indirect
-	github.com/sergi/go-diff v1.4.0 // indirect
-	github.com/spf13/pflag v1.0.6 // indirect
+	github.com/spf13/pflag v1.0.7 // indirect
 	github.com/tchap/go-patricia/v2 v2.3.3 // indirect
 	github.com/vektah/gqlparser/v2 v2.5.30 // indirect
 	github.com/x448/float16 v0.8.4 // indirect
 	github.com/xeipuuv/gojsonpointer v0.0.0-20190905194746-02993c407bfb // indirect
 	github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415 // indirect
 	github.com/yashtewari/glob-intersection v0.2.0 // indirect
 	go.opentelemetry.io/auto/sdk v1.1.0 // indirect
-	go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.62.0 // indirect
 	go.opentelemetry.io/otel v1.37.0 // indirect
-	go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.37.0 // indirect
-	go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.37.0 // indirect
-	go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.37.0 // indirect
 	go.opentelemetry.io/otel/metric v1.37.0 // indirect
 	go.opentelemetry.io/otel/sdk v1.37.0 // indirect
 	go.opentelemetry.io/otel/trace v1.37.0 // indirect
@@ -102,7 +98,6 @@ require (
 	gomodules.xyz/jsonpatch/v2 v2.5.0 // indirect
 	google.golang.org/genproto/googleapis/api v0.0.0-20250715232539-7130f93afb79 // indirect
 	google.golang.org/genproto/googleapis/rpc v0.0.0-20250715232539-7130f93afb79 // indirect
-	google.golang.org/grpc v1.73.0 // indirect
 	google.golang.org/protobuf v1.36.6 // indirect
 	gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect
 	gopkg.in/inf.v0 v0.9.1 // indirect

go.sum

@@ -37,8 +37,8 @@ github.com/evanphx/json-patch v5.9.0+incompatible h1:fBXyNpNMuTTDdquAq/uisOr2lSh
 github.com/evanphx/json-patch v5.9.0+incompatible/go.mod h1:50XU6AFN0ol/bzJsmQLiYLvXMP4fmwYFNcr97nuDLSk=
 github.com/evanphx/json-patch/v5 v5.9.11 h1:/8HVnzMq13/3x9TPvjG08wUGqBTmZBsCWzjTM0wiaDU=
 github.com/evanphx/json-patch/v5 v5.9.11/go.mod h1:3j+LviiESTElxA4p3EMKAB9HXj3/XEtnUf6OZxqIQTM=
-github.com/fairwindsops/insights-plugins/plugins/opa v0.0.0-20250715140540-2403ef57f5b0 h1:rFEeAq834U5fvrgKr6jDEK3yt1Ymeq2r1W/iE8pqisI=
-github.com/fairwindsops/insights-plugins/plugins/opa v0.0.0-20250715140540-2403ef57f5b0/go.mod h1:oEFUk4MCD+xHeaJdwOy7afX18OnhheXSn3EOjEqw8qk=
+github.com/fairwindsops/insights-plugins/plugins/opa v0.0.0-20250731170703-4746d9c4a102 h1:4T2M9ybtnfJjjmU7uj3ELfsNkRh7mI8yXH11pLrGRuA=
+github.com/fairwindsops/insights-plugins/plugins/opa v0.0.0-20250731170703-4746d9c4a102/go.mod h1:oEFUk4MCD+xHeaJdwOy7afX18OnhheXSn3EOjEqw8qk=
 github.com/fatih/color v1.18.0 h1:S8gINlzdQ840/4pfAwic/ZE0djQEH3wM94VfqLTZcOM=
 github.com/fatih/color v1.18.0/go.mod h1:4FelSpRwEGDpQ12mAdzqdOukCy4u8WUtOY6lkT/6HfU=
 github.com/felixge/httpsnoop v1.0.4 h1:NFTV2Zj1bL4mc9sqWACXbQFVBBg2W3GPvqp8/ESS2Wg=
@@ -110,11 +110,8 @@ github.com/kisielk/errcheck v1.5.0/go.mod h1:pFxgyoBC7bSaBwPgfKdkLd5X25qrDl4LWUI
 github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck=
 github.com/klauspost/compress v1.18.0 h1:c/Cqfb0r+Yi+JtIEq73FWXVkRonBlf0CRNYc8Zttxdo=
 github.com/klauspost/compress v1.18.0/go.mod h1:2Pp+KzxcywXVXMr50+X0Q/Lsb43OQHYWRCY2AiWywWQ=
-github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo=
 github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE=
 github.com/kr/pretty v0.3.1/go.mod h1:hoEshYVHaxMs3cyo3Yncou5ZscifuDolrwPKZanG3xk=
-github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
-github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
 github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
 github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE=
 github.com/kylelemons/godebug v1.1.0 h1:RPNrshWIDI6G2gRW9EHilWtl7Z6Sb1BR0xunSBf0SNc=
@@ -138,8 +135,8 @@ github.com/onsi/ginkgo/v2 v2.22.2 h1:/3X8Panh8/WwhU/3Ssa6rCKqPLuAkVY2I0RoyDLySlU
 github.com/onsi/ginkgo/v2 v2.22.2/go.mod h1:oeMosUL+8LtarXBHu/c0bx2D/K9zyQ6uX3cTyztHwsk=
 github.com/onsi/gomega v1.36.2 h1:koNYke6TVk6ZmnyHrCXba/T/MoLBXFjeC1PtvYgw0A8=
 github.com/onsi/gomega v1.36.2/go.mod h1:DdwyADRjrc825LhMEkD76cHR5+pUnjhUN8GlHlRPHzY=
-github.com/open-policy-agent/opa v1.6.0 h1:/S/cnNQJ2MUMNzizHPbisTWBHowmLkPrugY5jjkPlRQ=
-github.com/open-policy-agent/opa v1.6.0/go.mod h1:zFmw4P+W62+CWGYRDDswfVYSCnPo6oYaktQnfIaRFC4=
+github.com/open-policy-agent/opa v1.7.1 h1:bhA2UGq5oS25471WB9aCJBWEp5/7WK+Nyb2PMAChQIg=
+github.com/open-policy-agent/opa v1.7.1/go.mod h1:7cPuErOAt7k/oVWAVJnxqAC6mwArrAazkvk0RXiih2A=
 github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4=
 github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
@@ -172,13 +169,13 @@ github.com/sirupsen/logrus v1.9.3 h1:dueUQJ1C2q9oE3F7wvmSGAaVtTmUizReu6fjN8uqzbQ
 github.com/sirupsen/logrus v1.9.3/go.mod h1:naHLuLoDiP4jHNo9R0sCBMtWGeIprob74mVsIT4qYEQ=
 github.com/spf13/cobra v1.9.1 h1:CXSaggrXdbHK9CF+8ywj8Amf7PBRmPCOJugH954Nnlo=
 github.com/spf13/cobra v1.9.1/go.mod h1:nDyEzZ8ogv936Cinf6g1RU9MRY64Ir93oCnqb9wxYW0=
-github.com/spf13/pflag v1.0.6 h1:jFzHGLGAlb3ruxLB8MhbI6A8+AQX/2eW4qeyNZXNp2o=
 github.com/spf13/pflag v1.0.6/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg=
+github.com/spf13/pflag v1.0.7 h1:vN6T9TfwStFPFM5XzjsvmzZkLuaLX+HS+0SeFLRgU6M=
+github.com/spf13/pflag v1.0.7/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg=
 github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
 github.com/stretchr/objx v0.5.2 h1:xuMeJ0Sdp5ZMRXx/aWO6RZxdr3beISkG5/G/aIRr3pY=
 github.com/stretchr/objx v0.5.2/go.mod h1:FRsXN1f5AsAjCGJKqEizvkpNtU+EGNCLh3NxZ/8L+MA=
 github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
-github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4=
 github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
 github.com/stretchr/testify v1.10.0 h1:Xv5erBjTwe/5IxqUQTdXv5kgmIvbHo3QQyRwhJsOfJA=
 github.com/stretchr/testify v1.10.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
@@ -285,19 +282,17 @@ google.golang.org/genproto/googleapis/api v0.0.0-20250715232539-7130f93afb79 h1:
 google.golang.org/genproto/googleapis/api v0.0.0-20250715232539-7130f93afb79/go.mod h1:HKJDgKsFUnv5VAGeQjz8kxcgDP0HoE0iZNp0OdZNlhE=
 google.golang.org/genproto/googleapis/rpc v0.0.0-20250715232539-7130f93afb79 h1:1ZwqphdOdWYXsUHgMpU/101nCtf/kSp9hOrcvFsnl10=
 google.golang.org/genproto/googleapis/rpc v0.0.0-20250715232539-7130f93afb79/go.mod h1:qQ0YXyHHx3XkvlzUtpXDkS29lDSafHMZBAZDc03LQ3A=
-google.golang.org/grpc v1.73.0 h1:VIWSmpI2MegBtTuFt5/JWy2oXxtjJ/e89Z70ImfD2ok=
-google.golang.org/grpc v1.73.0/go.mod h1:50sbHOUqWoCQGI8V2HQLJM0B+LMlIUjNSZmow7EVBQc=
+google.golang.org/grpc v1.74.2 h1:WoosgB65DlWVC9FqI82dGsZhWFNBSLjQ84bjROOpMu4=
+google.golang.org/grpc v1.74.2/go.mod h1:CtQ+BGjaAIXHs/5YS3i473GqwBBa1zGQNevxdeBEXrM=
 google.golang.org/protobuf v1.36.6 h1:z1NpPI8ku2WgiWnf+t9wTPsn6eP1L7ksHUlkfLvd9xY=
 google.golang.org/protobuf v1.36.6/go.mod h1:jduwjTPXsFjZGTmRluh+L6NjiWu7pchiJ2/5YcXBHnY=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
-gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk=
 gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q=
 gopkg.in/evanphx/json-patch.v4 v4.12.0 h1:n6jtcsulIzXPJaxegRbvFNNrZDjbij7ny3gmSPG+6V4=
 gopkg.in/evanphx/json-patch.v4 v4.12.0/go.mod h1:p8EYWUEYMpynmqDbY58zCKCFZw8pRWMG4EsWvDvM72M=
 gopkg.in/inf.v0 v0.9.1 h1:73M5CoZyi3ZLMOyDlQh031Cx6N9NDJ2Vvfl76EDAgDc=
 gopkg.in/inf.v0 v0.9.1/go.mod h1:cWUDdTG/fYaXco+Dcufb5Vnc6Gp2YChqWtbxRZE0mXw=
-gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY=
 gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ=
 gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
@@ -329,5 +324,5 @@ sigs.k8s.io/randfill v1.0.0/go.mod h1:XeLlZ/jmk4i1HRopwe7/aU3H5n1zNUcX6TM94b3QxO
 sigs.k8s.io/structured-merge-diff/v4 v4.7.0 h1:qPeWmscJcXP0snki5IYF79Z8xrl8ETFxgMd7wez1XkI=
 sigs.k8s.io/structured-merge-diff/v4 v4.7.0/go.mod h1:dDy58f92j70zLsuZVuUX5Wp9vtxXpaZnkPGWeqDfCps=
 sigs.k8s.io/yaml v1.4.0/go.mod h1:Ejl7/uTz7PSA4eKMyQCUTnhZYNmLIl+5c2lQPGR2BPY=
-sigs.k8s.io/yaml v1.5.0 h1:M10b2U7aEUY6hRtU870n2VTPgR5RZiL/I6Lcc2F4NUQ=
-sigs.k8s.io/yaml v1.5.0/go.mod h1:wZs27Rbxoai4C0f8/9urLZtZtF3avA3gKvGyPdDqTO4=
+sigs.k8s.io/yaml v1.6.0 h1:G8fkbMSAFqgEFgh4b1wmtzDnioxFCUgTZhlbj5P9QYs=
+sigs.k8s.io/yaml v1.6.0/go.mod h1:796bPqUfzR/0jLAl6XjHl3Ck7MiyVv8dbTdyT3/pMf4=

pkg/appgroups/appgroups.go

@@ -7,6 +7,7 @@ import (
 	"reflect"
 
 	"github.com/fairwindsops/insights-cli/pkg/directory"
+	"github.com/imroc/req/v3"
 	"github.com/samber/lo"
 	"github.com/sirupsen/logrus"
 	"github.com/xlab/treeprint"
@@ -23,14 +24,14 @@ func AddAppGroupsBranch(tree treeprint.Tree, appGroups []AppGroup) error {
 }
 
 // PushAppGroups pushes app-groups to insights
-func PushAppGroups(pushDir, org, insightsToken, host string, deleteMissing, dryRun bool) error {
+func PushAppGroups(client *req.Client, pushDir, org string, deleteMissing, dryRun bool) error {
 	logrus.Debugln("Pushing app-groups")
 	_, err := os.Stat(pushDir)
 	if err != nil {
 		return err
 	}
 
-	existingAppGroups, err := FetchAppGroups(org, insightsToken, host)
+	existingAppGroups, err := FetchAppGroups(client, org)
 	if err != nil {
 		return fmt.Errorf("error during API call: %w", err)
 	}
@@ -43,9 +44,9 @@ func PushAppGroups(pushDir, org, insightsToken, host string, deleteMissing, dryR
 	for _, appGroup := range upserts {
 		logrus.Infof("upsert app-group: %s", appGroup.Name)
 		if !dryRun {
-			err = upsertAppGroup(org, insightsToken, host, appGroup)
+			err = upsertAppGroup(client, org, appGroup)
 			if err != nil {
-				return fmt.Errorf("Error while upsert app-group %s to Fairwinds Insights: %w", appGroup.Name, err)
+				return fmt.Errorf("error while upsert app-group %s to Fairwinds Insights: %w", appGroup.Name, err)
 			}
 		}
 	}
@@ -54,9 +55,9 @@ func PushAppGroups(pushDir, org, insightsToken, host string, deleteMissing, dryR
 		for _, appGroupForDelete := range deletes {
 			logrus.Infof("Deleting app-group: %s", appGroupForDelete.Name)
 			if !dryRun {
-				err = deleteAppGroup(org, insightsToken, host, appGroupForDelete)
+				err = deleteAppGroup(client, org, appGroupForDelete)
 				if err != nil {
-					return fmt.Errorf("Error while deleting app-group %s from insights: %w", appGroupForDelete.Name, err)
+					return fmt.Errorf("error while deleting app-group %s from insights: %w", appGroupForDelete.Name, err)
 				}
 			}
 		}

pkg/appgroups/appgroups_requests.go

@@ -4,27 +4,26 @@ import (
 	"fmt"
 
 	"github.com/fairwindsops/insights-cli/pkg/utils"
-	"github.com/fairwindsops/insights-cli/pkg/version"
 	"github.com/imroc/req/v3"
 	"github.com/sirupsen/logrus"
 )
 
 const (
-	appGroupURLFormat       = "%s/v0/organizations/%s/app-groups"
-	appGroupURLSingleFormat = "%s/v0/organizations/%s/app-groups/%s"
+	appGroupURLFormat       = "/v0/organizations/%s/app-groups"
+	appGroupURLSingleFormat = "/v0/organizations/%s/app-groups/%s"
 )
 
 // FetchAppGroups queries Fairwinds Insights to retrieve all of the app-groups for an organization
-func FetchAppGroups(org, token, hostName string) ([]AppGroup, error) {
-	url := fmt.Sprintf(appGroupURLFormat, hostName, org)
+func FetchAppGroups(client *req.Client, org string) ([]AppGroup, error) {
+	url := fmt.Sprintf(appGroupURLFormat, org)
 	logrus.Debugf("fetchAppGroups: appGroups URL: %s", url)
-	resp, err := req.C().R().SetHeaders(utils.GetHeaders(version.GetVersion(), token, "")).Get(url)
+	resp, err := client.R().SetHeaders(utils.GetHeaders("")).Get(url)
 	if err != nil {
 		return nil, fmt.Errorf("unable to fetch app-groups from insights: %w", err)
 	}
 	var appGroups []AppGroup
-	if !utils.IsSuccessful(resp.Response.StatusCode) {
-		return nil, fmt.Errorf("invalid response code - expected 200, got %d: %s", resp.Response.StatusCode, string(resp.Bytes()))
+	if resp.IsErrorState() {
+		return nil, fmt.Errorf("invalid response code - expected 200, got %d: %s", resp.StatusCode, string(resp.Bytes()))
 	}
 	err = resp.Unmarshal(&appGroups)
 	if err != nil {
@@ -34,40 +33,39 @@ func FetchAppGroups(org, token, hostName string) ([]AppGroup, error) {
 }
 
 // upsertAppGroup requests Fairwinds Insights to upsert an app-group for an organization
-func upsertAppGroup(org, token, hostName string, appGroup AppGroup) error {
-	url := fmt.Sprintf(appGroupURLFormat, hostName, org)
+func upsertAppGroup(client *req.Client, org string, appGroup AppGroup) error {
+	url := fmt.Sprintf(appGroupURLFormat, org)
 	logrus.Debugf("upsertAppGroup: appGroups URL: %s", url)
-	resp, err := req.C().R().SetHeaders(utils.GetHeaders(version.GetVersion(), token, "")).SetBody(&appGroup).Post(url)
+	resp, err := client.R().SetHeaders(utils.GetHeaders("")).SetBody(&appGroup).Post(url)
 	if err != nil {
 		return fmt.Errorf("unable to fetch app-groups from insights: %w", err)
 	}
-	if !utils.IsSuccessful(resp.Response.StatusCode) {
-		return fmt.Errorf("invalid response code - expected 200, got %d: %s", resp.Response.StatusCode, string(resp.Bytes()))
+	if resp.IsErrorState() {
+		return fmt.Errorf("invalid response code - expected 200, got %d: %s", resp.StatusCode, string(resp.Bytes()))
 	}
 	var response AppGroup
 	err = resp.Unmarshal(&response)
 	if err != nil {
-		return fmt.Errorf("Unable to convert response to json for app-groups: %w", err)
-
+		return fmt.Errorf("unable to convert response to json for app-groups: %w", err)
 	}
 	return nil
 }
 
 // deleteAppGroup requests Fairwinds Insights to remove an app-group for an organization
-func deleteAppGroup(org, token, hostName string, appGroup AppGroup) error {
-	url := fmt.Sprintf(appGroupURLSingleFormat, hostName, org, appGroup.Name)
+func deleteAppGroup(client *req.Client, org string, appGroup AppGroup) error {
+	url := fmt.Sprintf(appGroupURLSingleFormat, org, appGroup.Name)
 	logrus.Debugf("deleteAppGroup: appGroups URL: %s", url)
-	resp, err := req.C().R().SetHeaders(utils.GetHeaders(version.GetVersion(), token, "")).Delete(url)
+	resp, err := client.R().SetHeaders(utils.GetHeaders("")).Delete(url)
 	if err != nil {
 		return fmt.Errorf("unable to fetch app-groups from insights: %w", err)
 	}
-	if !utils.IsSuccessful(resp.Response.StatusCode) {
-		return fmt.Errorf("invalid response code - expected 200, got %d: %s", resp.Response.StatusCode, string(resp.Bytes()))
+	if resp.IsErrorState() {
+		return fmt.Errorf("invalid response code - expected 200, got %d: %s", resp.StatusCode, string(resp.Bytes()))
 	}
 	var response AppGroup
 	err = resp.Unmarshal(&response)
 	if err != nil {
-		return fmt.Errorf("Unable to convert response to json for app-groups: %w", err)
+		return fmt.Errorf("unable to convert response to json for app-groups: %w", err)
 	}
 	return nil
 }

pkg/cli/disable.go

@@ -28,7 +28,7 @@ var disablePolicyMappings = &cobra.Command{
 	Long:   "Disable policy mappings",
 	PreRun: validateAndLoadInsightsAPIConfigWrapper,
 	Run: func(cmd *cobra.Command, args []string) {
-		err := organizations.ManageOrganizationPolicyMappings(configurationObject.Options.Organization, insightsToken, configurationObject.Options.Hostname, false)
+		err := organizations.ManageOrganizationPolicyMappings(client, configurationObject.Options.Organization, false)
 		if err != nil {
 			logrus.Fatal(err)
 		}

pkg/cli/download.go

@@ -113,7 +113,11 @@ func IsEmpty(path string) (bool, error) {
 	if err != nil {
 		return false, err
 	}
-	defer f.Close()
+	defer func() {
+		if err := f.Close(); err != nil {
+			logrus.Errorf("error closing file %s: %v", path, err)
+		}
+	}()
 
 	_, err = f.Readdirnames(1) // Or f.Readdir(1)
 	if err == io.EOF {

pkg/cli/download_app_groups.go

@@ -22,8 +22,7 @@ var downloadAppGroupsCmd = &cobra.Command{
 	PreRun: validateAndLoadInsightsAPIConfigWrapper,
 	Run: func(cmd *cobra.Command, args []string) {
 		org := configurationObject.Options.Organization
-		host := configurationObject.Options.Hostname
-		appGroups, err := appgroups.FetchAppGroups(org, insightsToken, host)
+		appGroups, err := appgroups.FetchAppGroups(client, org)
 		if err != nil {
 			logrus.Fatalf("unable to fetch app-groups from insights: %v", err)
 		}