From 2325c1546a8592c0ca3d2fd43ed5128cca04bedb Mon Sep 17 00:00:00 2001
From: Kim Tore Jensen <kimtjen@gmail.com>
Date: Thu, 7 Nov 2024 09:12:06 +0100
Subject: [PATCH] fix: remove unused config of google client id/secret

---
 charts/hookd/Chart.yaml    | 2 +-
 charts/hookd/Feature.yaml  | 9 ---------
 charts/hookd/values.yaml   | 3 ---
 pkg/hookd/config/config.go | 5 -----
 4 files changed, 1 insertion(+), 18 deletions(-)

diff --git a/charts/hookd/Chart.yaml b/charts/hookd/Chart.yaml
index a1db215b..59c6b39c 100644
--- a/charts/hookd/Chart.yaml
+++ b/charts/hookd/Chart.yaml
@@ -4,4 +4,4 @@ name: hookd
 description: Receives deploy instructions, verifies authenticity and sends to deployd in the desired cluster.
 sources:
   - https://github.com/nais/deploy/tree/master/charts/hookd
-version: 0.0.1
+version: 0.0.2
diff --git a/charts/hookd/Feature.yaml b/charts/hookd/Feature.yaml
index ce6e8892..ee8308af 100644
--- a/charts/hookd/Feature.yaml
+++ b/charts/hookd/Feature.yaml
@@ -51,15 +51,6 @@ values:
   deploydPreSharedKeys:
     computed:
       template: '"{{ eachOf .Envs "deployd_pre_shared_key" | join "," }}"'
-  googleClient.id:
-    description: Google OAuth 2.0 Client ID, see https://handbook.nais.io/technical/tenant-setup/#set-up-oauth-client
-    config:
-      type: string
-  googleClient.secret:
-    description: Google OAuth 2.0 Client Secret, see https://handbook.nais.io/technical/tenant-setup/#set-up-oauth-client
-    config:
-      type: string
-      secret: true
   ingress.host:
     displayName: Ingress URL
     computed:
diff --git a/charts/hookd/values.yaml b/charts/hookd/values.yaml
index e8ad24a9..534b7fe0 100644
--- a/charts/hookd/values.yaml
+++ b/charts/hookd/values.yaml
@@ -7,9 +7,6 @@ ingress:
   className: "nais-ingress-external"
 
 deploydPreSharedKeys: # mapped by fasit
-googleClient:
-  id: # mapped by fasit
-  secret: # mapped by fasit
 
 logLinkFormatter: "GCP"
 otelExporterOtlpEndpoint: # mapped by fasit
diff --git a/pkg/hookd/config/config.go b/pkg/hookd/config/config.go
index 2c45f1d2..571ca8bf 100644
--- a/pkg/hookd/config/config.go
+++ b/pkg/hookd/config/config.go
@@ -24,7 +24,6 @@ type Config struct {
 	FrontendKeys              []string      `json:"frontend-keys"`
 	GRPC                      GRPC          `json:"grpc"`
 	GoogleAllowedDomains      []string      `json:"google-allowed-domains"`
-	GoogleClientId            string        `json:"google-client-id"`
 	GoogleClusterProjects     []string      `json:"google-cluster-projects"`
 	ListenAddress             string        `json:"listen-address"`
 	LogFormat                 string        `json:"log-format"`
@@ -45,7 +44,6 @@ const (
 	DeploydKeys               = "deployd-keys"
 	FrontendKeys              = "frontend-keys"
 	GoogleAllowedDomains      = "google-allowed-domains"
-	GoogleClientId            = "google-client-id"
 	GoogleClusterProjects     = "google-cluster-projects"
 	GrpcAddress               = "grpc.address"
 	GrpcCliAuthentication     = "grpc.cli-authentication"
@@ -69,8 +67,6 @@ func bindNAIS() {
 
 	viper.BindEnv(DeploydKeys, "DEPLOYD_KEYS")
 	viper.BindEnv(FrontendKeys, "FRONTEND_KEYS")
-
-	viper.BindEnv(GoogleClientId, "GOOGLE_CLIENT_ID")
 }
 
 func Initialize() *Config {
@@ -99,7 +95,6 @@ func Initialize() *Config {
 	flag.StringSlice(DeploydKeys, nil, "Pre-shared deployd keys, comma separated")
 	flag.StringSlice(FrontendKeys, nil, "Pre-shared frontend keys, comma separated")
 
-	flag.String(GoogleClientId, "", "Google ClientId.")
 	flag.StringSlice(GoogleAllowedDomains, []string{}, "Allowed Google Domains")
 	flag.StringSlice(GoogleClusterProjects, []string{}, "Mapping cluster to google project: cluster1=project1,cluster2=project2")