fix: golang ci

cli/.golangci.yml

@@ -1,6 +1,7 @@
 linters:
   enable:
     - forbidigo
+    - depguard
 
 linters-settings:
   forbidigo:
@@ -14,25 +15,33 @@ linters-settings:
       - ^println$
       - ^NewTestHappyConfig$
   depguard:
-    list-type: denylist
-    include-go-root: true
-    packages-with-error-message:
-      # TODO: logrus is in maintenance mode, use a newer alternative
-      # - github.com/sirupsen/logrus: "logging is allowed only by zerolog"
-      - errors: "please use github.com/pkg/errors instead"
-      - golang.org/x/xerrors: "please use github.com/pkg/errors instead"
-      - gopkg.in/yaml.v2: "please use gopkg.in/yaml.v3 instead"
-    additional-guards:
-      # Do not allow test code into "real" code
-      - list-type: denylist
-        include-go-root: false
-        packages:
-          - github.com/stretchr/testify
-          - github.com/happy/pkg/backend/aws/testbackend
-        ignore-file-rules:
-          - "**/*_test.go"
-          - "**/mock/**/*.go"
-          - "pkg/backend/aws/testbackend/*.go"
+    rules:
+      # Main rule: disallow certain core packages across all code
+      main:
+        list-mode: lax  # can be 'lax', 'original', or 'strict'
+        files:
+          - $all
+        allow:
+          - $gostd
+        deny:
+          - pkg: "errors$"
+            desc: please use github.com/pkg/errors instead
+          - pkg: "golang.org/x/xerrors"
+            desc: please use github.com/pkg/errors instead
+          - pkg: "gopkg.in/yaml.v2"
+            desc: please use gopkg.in/yaml.v3 instead
+      # Secondary rule: prevent test packages from leaking into non-test code
+      no-testify-in-prod:
+        list-mode: lax
+        files:
+          - "!$test"  # exclude test files
+        allow:
+          - $gostd
+        deny:
+          - pkg: "github.com/stretchr/testify"
+            desc: test-only package
+          - pkg: "github.com/happy/pkg/backend/aws/testbackend"
+            desc: test-only package
 issues:
   exclude-rules:
     # Exclude some linters from running on tests files.

cli/cmd/delete.go

@@ -5,7 +5,7 @@ import (
 	"fmt"
 	"path/filepath"
 
-	"github.com/AlecAivazis/survey/v2"
+	survey "github.com/AlecAivazis/survey/v2"
 	happyCmd "github.com/chanzuckerberg/happy/cli/pkg/cmd"
 	"github.com/chanzuckerberg/happy/cli/pkg/orchestrator"
 	backend "github.com/chanzuckerberg/happy/shared/backend/aws"

cli/cmd/infra_generate.go

@@ -1,7 +1,7 @@
 package cmd
 
 import (
-	"github.com/AlecAivazis/survey/v2"
+	survey "github.com/AlecAivazis/survey/v2"
 	"github.com/chanzuckerberg/happy/shared/composemanager"
 	"github.com/chanzuckerberg/happy/shared/config"
 	"github.com/chanzuckerberg/happy/shared/diagnostics"

cli/cmd/infra_ingest.go

@@ -1,7 +1,7 @@
 package cmd
 
 import (
-	"github.com/AlecAivazis/survey/v2"
+	survey "github.com/AlecAivazis/survey/v2"
 	"github.com/chanzuckerberg/happy/shared/composemanager"
 	"github.com/chanzuckerberg/happy/shared/config"
 	"github.com/chanzuckerberg/happy/shared/diagnostics"

cli/cmd/infra_refresh.go

@@ -1,7 +1,7 @@
 package cmd
 
 import (
-	"github.com/AlecAivazis/survey/v2"
+	survey "github.com/AlecAivazis/survey/v2"
 	"github.com/chanzuckerberg/happy/shared/config"
 	"github.com/chanzuckerberg/happy/shared/diagnostics"
 	"github.com/chanzuckerberg/happy/shared/hclmanager"

cli/cmd/init.go

@@ -8,7 +8,7 @@ import (
 	"runtime"
 	"strings"
 
-	"github.com/AlecAivazis/survey/v2"
+	survey "github.com/AlecAivazis/survey/v2"
 	"github.com/chanzuckerberg/go-misc/sets"
 	ab "github.com/chanzuckerberg/happy/cli/pkg/artifact_builder"
 	"github.com/chanzuckerberg/happy/cli/pkg/orchestrator"

cli/pkg/artifact_builder/docker_compose.go

@@ -6,7 +6,7 @@ import (
 
 	"github.com/pkg/errors"
 	"github.com/sirupsen/logrus"
-	"gopkg.in/yaml.v3"
+	yaml "gopkg.in/yaml.v3"
 )
 
 type DockerCommand string

cli/pkg/cmd/validate.go

@@ -3,7 +3,7 @@ package cmd
 import (
 	"regexp"
 
-	"github.com/hashicorp/go-multierror"
+	multierror "github.com/hashicorp/go-multierror"
 	"github.com/pkg/errors"
 	"github.com/spf13/cobra"
 )

cli/pkg/config_manager/config_manager.go

@@ -8,7 +8,7 @@ import (
 	"sort"
 	"strings"
 
-	"github.com/AlecAivazis/survey/v2"
+	survey "github.com/AlecAivazis/survey/v2"
 	"github.com/chanzuckerberg/happy/cli/templates"
 	"github.com/chanzuckerberg/happy/shared/config"
 	"github.com/chanzuckerberg/happy/shared/util"

cli/pkg/config_manager/environment.go

@@ -4,7 +4,7 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/AlecAivazis/survey/v2"
+	survey "github.com/AlecAivazis/survey/v2"
 	"github.com/chanzuckerberg/happy/shared/config"
 	"github.com/chanzuckerberg/happy/shared/k8s"
 	"github.com/chanzuckerberg/happy/shared/util"

cli/pkg/config_manager/service.go

@@ -6,7 +6,7 @@ import (
 	"strconv"
 	"strings"
 
-	"github.com/AlecAivazis/survey/v2"
+	survey "github.com/AlecAivazis/survey/v2"
 	"github.com/chanzuckerberg/happy/shared/config"
 	"github.com/pkg/errors"
 )

cli/pkg/orchestrator/orchestrator_test.go

@@ -28,7 +28,7 @@ import (
 	"github.com/chanzuckerberg/happy/shared/util"
 	"github.com/chanzuckerberg/happy/shared/workspace_repo"
 	"github.com/golang/mock/gomock"
-	"github.com/hashicorp/go-tfe"
+	tfe "github.com/hashicorp/go-tfe"
 	"github.com/stretchr/testify/require"
 )
 

cli/pkg/output/printer_factory.go

@@ -11,7 +11,7 @@ import (
 	"github.com/chanzuckerberg/happy/shared/model"
 	"github.com/chanzuckerberg/happy/shared/util"
 	"github.com/sirupsen/logrus"
-	"gopkg.in/yaml.v3"
+	yaml "gopkg.in/yaml.v3"
 )
 
 type Printer interface {