Merge pull request #266 from safedep/feat/add-support-dev-mode

feat: Add support for API URL overrides

.gitignore

@@ -15,5 +15,5 @@
 # vendor/
 
 /vet
-
 dist/
+/.env.dev

go.mod

@@ -3,8 +3,8 @@ module github.com/safedep/vet
 go 1.23.2
 
 require (
-	buf.build/gen/go/safedep/api/grpc/go v1.5.1-20241021065218-021c29274fc6.1
-	buf.build/gen/go/safedep/api/protocolbuffers/go v1.35.1-20241021065218-021c29274fc6.1
+	buf.build/gen/go/safedep/api/grpc/go v1.5.1-20241023094826-0cc88affe8f4.1
+	buf.build/gen/go/safedep/api/protocolbuffers/go v1.35.1-20241023094826-0cc88affe8f4.1
 	github.com/AlecAivazis/survey/v2 v2.3.7
 	github.com/CycloneDX/cyclonedx-go v0.9.1
 	github.com/anchore/syft v1.14.1

go.sum

@@ -2,8 +2,16 @@ buf.build/gen/go/bufbuild/protovalidate/protocolbuffers/go v1.35.1-2024092016423
 buf.build/gen/go/bufbuild/protovalidate/protocolbuffers/go v1.35.1-20240920164238-5a7b106cbb87.1/go.mod h1:Duw/9JoXkXIydyASnLYIiufkzySThoqavOsF+IihqvM=
 buf.build/gen/go/safedep/api/grpc/go v1.5.1-20241021065218-021c29274fc6.1 h1:g7y1C4EeDQpg4rFciYfXxmeW28UX+ySv5nQbBFpvbiA=
 buf.build/gen/go/safedep/api/grpc/go v1.5.1-20241021065218-021c29274fc6.1/go.mod h1:+Fs1Kwxdn+N0xgYXBtKIw7M7BGUtZmkOND8V8zDO/Ys=
+buf.build/gen/go/safedep/api/grpc/go v1.5.1-20241023034507-f29b26e33b84.1 h1:S/3hIsDul9jcSXqaG/dwhRaz2DvshrDeyLMq/2UBBOI=
+buf.build/gen/go/safedep/api/grpc/go v1.5.1-20241023034507-f29b26e33b84.1/go.mod h1:IkuTE1VLIZwtnJvCEMat8mIhoRk92/R9H2tMCTYI4hU=
+buf.build/gen/go/safedep/api/grpc/go v1.5.1-20241023094826-0cc88affe8f4.1 h1:HGihq+yyD2jkeKWET/tlHRoCP/en+Eodg7yzqz3QWyU=
+buf.build/gen/go/safedep/api/grpc/go v1.5.1-20241023094826-0cc88affe8f4.1/go.mod h1:nzJWFl1LLNVEW72epR1/zFcdHXwXtv7B0PS2loPDMQE=
 buf.build/gen/go/safedep/api/protocolbuffers/go v1.35.1-20241021065218-021c29274fc6.1 h1:c9YRtuOJh9H9aR/nxFqjDyCzt03DdZfllX64aW/O4E4=
 buf.build/gen/go/safedep/api/protocolbuffers/go v1.35.1-20241021065218-021c29274fc6.1/go.mod h1:WCxZaBpYxgWnSpauuzVhzbJawAp6uPXJPN5tbDpceQ0=
+buf.build/gen/go/safedep/api/protocolbuffers/go v1.35.1-20241023034507-f29b26e33b84.1 h1:sjntwKL0M0cj6NRpkulewQrO8qXCA+BOlOjqlCBc3qE=
+buf.build/gen/go/safedep/api/protocolbuffers/go v1.35.1-20241023034507-f29b26e33b84.1/go.mod h1:WCxZaBpYxgWnSpauuzVhzbJawAp6uPXJPN5tbDpceQ0=
+buf.build/gen/go/safedep/api/protocolbuffers/go v1.35.1-20241023094826-0cc88affe8f4.1 h1:3rqy0HyEq00gU+M2fEhFl0HwpBckieqlv3DG9L4EfwA=
+buf.build/gen/go/safedep/api/protocolbuffers/go v1.35.1-20241023094826-0cc88affe8f4.1/go.mod h1:WCxZaBpYxgWnSpauuzVhzbJawAp6uPXJPN5tbDpceQ0=
 cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
 cloud.google.com/go v0.34.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
 cloud.google.com/go v0.38.0/go.mod h1:990N+gfupTy94rShfmMCWGDn0LpTmnzTp2qbd1dvSRU=

internal/auth/auth.go

@@ -12,6 +12,8 @@ import (
 
 const (
 	apiUrlEnvKey             = "VET_INSIGHTS_API_URL"
+	syncUrlEnvKey            = "VET_SYNC_API_URL"
+	controlPlaneUrlEnvKey    = "VET_CONTROL_PLANE_API_URL"
 	apiKeyEnvKey             = "VET_API_KEY"
 	apiKeyAlternateEnvKey    = "VET_INSIGHTS_API_KEY"
 	communityModeEnvKey      = "VET_COMMUNITY_MODE"
@@ -152,6 +154,11 @@ func CloudRefreshToken() string {
 }
 
 func SyncApiUrl() string {
+	envOverride := os.Getenv(syncUrlEnvKey)
+	if envOverride != "" {
+		return envOverride
+	}
+
 	if (globalConfig != nil) && (globalConfig.SyncApiUrl != "") {
 		return globalConfig.SyncApiUrl
 	}
@@ -160,6 +167,11 @@ func SyncApiUrl() string {
 }
 
 func ControlTowerUrl() string {
+	envOverride := os.Getenv(controlPlaneUrlEnvKey)
+	if envOverride != "" {
+		return envOverride
+	}
+
 	if (globalConfig != nil) && (globalConfig.ControlPlaneApiUrl != "") {
 		return globalConfig.ControlPlaneApiUrl
 	}

pkg/cloud/query/query_service.go

@@ -6,6 +6,7 @@ import (
 	"buf.build/gen/go/safedep/api/grpc/go/safedep/services/controltower/v1/controltowerv1grpc"
 	controltowerv1 "buf.build/gen/go/safedep/api/protocolbuffers/go/safedep/services/controltower/v1"
 	"google.golang.org/grpc"
+	"google.golang.org/protobuf/types/known/structpb"
 )
 
 type queryService struct {
@@ -44,7 +45,16 @@ func (q *queryService) ExecuteSql(sql string, pageSize int) (*QueryResponse, err
 	for _, row := range res.Rows {
 		rowMap := make(map[string]interface{})
 		for key, val := range row.Fields {
-			rowMap[key] = val.GetStringValue()
+			switch val.GetKind().(type) {
+			case *structpb.Value_StringValue:
+				rowMap[key] = val.GetStringValue()
+			case *structpb.Value_NumberValue:
+				rowMap[key] = val.GetNumberValue()
+			case *structpb.Value_BoolValue:
+				rowMap[key] = val.GetBoolValue()
+			default:
+				rowMap[key] = ""
+			}
 		}
 
 		response = append(response, rowMap)

pkg/models/models.go

@@ -212,11 +212,14 @@ func (pm *PackageManifest) GetControlTowerSpecEcosystem() packagev1.Ecosystem {
 		return packagev1.Ecosystem_ECOSYSTEM_GITHUB_ACTIONS
 	case EcosystemPackagist:
 		return packagev1.Ecosystem_ECOSYSTEM_PACKAGIST
+	case EcosystemTerraform:
+		return packagev1.Ecosystem_ECOSYSTEM_TERRAFORM
 	default:
 		return packagev1.Ecosystem_ECOSYSTEM_UNSPECIFIED
 	}
 }
 
+// Deprecated: Move towards GetControlTowerSpecEcosystem
 func (pm *PackageManifest) GetSpecEcosystem() modelspec.Ecosystem {
 	switch pm.Ecosystem {
 	case EcosystemCargo: