From d48330e3ddcca328deb73a8630e5ed47ea7f4952 Mon Sep 17 00:00:00 2001
From: Lucille Hua <lucille.hua@gmail.com>
Date: Fri, 11 Nov 2022 11:22:15 -0800
Subject: [PATCH] Remove hardcoded smarthop related fields

---
 padcli/helm/helm.go         |  7 +----
 pkg/jetcloud/jetgcp/auth.go | 62 -------------------------------------
 2 files changed, 1 insertion(+), 68 deletions(-)
 delete mode 100644 pkg/jetcloud/jetgcp/auth.go

diff --git a/padcli/helm/helm.go b/padcli/helm/helm.go
index ecbfa6b..5debc9f 100644
--- a/padcli/helm/helm.go
+++ b/padcli/helm/helm.go
@@ -176,16 +176,11 @@ func (hvc *ValueComputer) Compute(ctx context.Context) error {
 }
 
 func (hvc *ValueComputer) ComputeHostname(ctx context.Context) (string, error) {
-	appFragment := ""
-	// Hack so we don't break old Smarthop URLs.
-	if hvc.cluster.GetHostname() == "smarthop.jetpack.dev" {
-		appFragment = "-app"
-	}
 	websvc, err := hvc.jetCfg.WebService()
 	if err != nil {
 		return "", errors.WithStack(err)
 	}
-	hostname := websvc.GetName() + appFragment + "-" + hvc.namespace + "." + hvc.cluster.GetHostname()
+	hostname := websvc.GetName() + "-" + hvc.namespace + "." + hvc.cluster.GetHostname()
 	url, err := websvc.GetURL()
 	if err != nil {
 		return "", errors.Wrap(err, "unable to get web service url")
diff --git a/pkg/jetcloud/jetgcp/auth.go b/pkg/jetcloud/jetgcp/auth.go
deleted file mode 100644
index 5c3c28f..0000000
--- a/pkg/jetcloud/jetgcp/auth.go
+++ /dev/null
@@ -1,62 +0,0 @@
-package jetgcp
-
-import (
-	"context"
-	"encoding/base64"
-	"encoding/json"
-	"os"
-
-	"github.com/docker/docker/api/types"
-	"github.com/pkg/errors"
-	"github.com/spf13/viper"
-	"golang.org/x/oauth2"
-	oauth2google "golang.org/x/oauth2/google"
-)
-
-// keep this in sync with pulumi script at provisioning/services/compiler.ts
-// TODO migrate over to using all env variables?
-const smarthopServiceAccountJsonKeyFilePath = "/home/smarthop_artifact_registry/creds.json"
-
-const smarthopServiceAccountEnv = "SMARTHOP_ARTIFACT_REGISTRY_CREDENTIALS"
-
-func getOauthToken(ctx context.Context, scopes []string) (*oauth2.Token, error) {
-	base64JSON := viper.GetString(smarthopServiceAccountEnv)
-	json, err := base64.StdEncoding.DecodeString(base64JSON)
-	if err != nil {
-		return nil, errors.WithStack(err)
-	}
-
-	if len(json) == 0 {
-		json, err = os.ReadFile(smarthopServiceAccountJsonKeyFilePath)
-		if err != nil {
-			return nil, errors.WithStack(err)
-		}
-	}
-	creds, err := oauth2google.CredentialsFromJSON(ctx, json, scopes...)
-	if err != nil {
-		return nil, errors.WithStack(err)
-	}
-	token, err := creds.TokenSource.Token()
-	return token, errors.WithStack(err)
-}
-
-func DockerCredentials(ctx context.Context) (string, error) {
-
-	scopes := []string{
-		"https://www.googleapis.com/auth/cloud-platform",
-	}
-	token, err := getOauthToken(ctx, scopes)
-	if err != nil {
-		return "", errors.WithStack(err)
-	}
-
-	authConfig := types.AuthConfig{
-		Username: "oauth2accesstoken",
-		Password: token.AccessToken,
-	}
-	jsonAuthConfig, err := json.Marshal(authConfig)
-	if err != nil {
-		return "", errors.WithStack(err)
-	}
-	return base64.URLEncoding.EncodeToString(jsonAuthConfig), nil
-}