add support for additional linode envs

Author: eljohnson92

Tiltfile

@@ -16,10 +16,14 @@ k8s_resource(
         "container-object-storage-controller:clusterrolebinding",
 ])
 namespace_create("linode-cosi-driver")
+args = ["apiToken=" + os.getenv("LINODE_TOKEN")]
+if os.getenv("LINODE_URL"):
+    args.append("linodeApiUrl=" + os.getenv("LINODE_URL"))
+
 k8s_yaml(helm( "./helm/linode-cosi-driver",
     "linode-cosi-driver",
     namespace="linode-cosi-driver",
-    set=["apiToken=" + os.getenv("LINODE_TOKEN")],
+    set=args,
 ))
 
 k8s_resource(

cmd/linode-cosi-driver/main.go

@@ -45,10 +45,8 @@ import (
 )
 
 const (
-	driverName     = "objectstorage.cosi.linode.com"
-	gracePeriod    = 5 * time.Second
-	envK8sNodeName = "K8S_NODE_NAME"
-	envK8sPodName  = "K8S_POD_NAME"
+	driverName  = "objectstorage.cosi.linode.com"
+	gracePeriod = 5 * time.Second
 )
 
 var ErrNoKeySpecified = errors.New("no S3 policy credentials, " +
@@ -57,9 +55,6 @@ var ErrNoKeySpecified = errors.New("no S3 policy credentials, " +
 
 func main() {
 	var (
-		linodeToken            = envflag.String("LINODE_TOKEN", "")
-		linodeURL              = envflag.String("LINODE_API_URL", "")
-		linodeAPIVersion       = envflag.String("LINODE_API_VERSION", "")
 		cosiEndpoint           = envflag.String("COSI_ENDPOINT", "unix:///var/lib/cosi/cosi.sock")
 		cacheTTL               = envflag.Duration("LINODE_OBJECT_STORAGE_ENDPOINT_CACHE_TTL", cache.DefaultTTL)
 		s3SSL                  = envflag.Bool("S3_CLIENT_SSL_ENABLED", true)
@@ -73,9 +68,6 @@ func main() {
 
 	if err := run(context.Background(), log, mainOptions{
 		cosiEndpoint:           cosiEndpoint,
-		linodeToken:            linodeToken,
-		linodeURL:              linodeURL,
-		linodeAPIVersion:       linodeAPIVersion,
 		cacheTTL:               cacheTTL,
 		s3SSL:                  s3SSL,
 		s3EphemeralCredentials: s3EphemeralCredentials,
@@ -90,9 +82,6 @@ func main() {
 
 type mainOptions struct {
 	cosiEndpoint           string
-	linodeToken            string
-	linodeURL              string
-	linodeAPIVersion       string
 	cacheTTL               time.Duration
 	s3SSL                  bool
 	s3EphemeralCredentials bool
@@ -120,11 +109,7 @@ func run(ctx context.Context, log *slog.Logger, opts mainOptions) error {
 	}
 
 	// initialize Linode client
-	client, err := linodeclient.NewLinodeClient(
-		opts.linodeToken,
-		fmt.Sprintf("LinodeCOSI/%s", version.Version),
-		opts.linodeURL,
-		opts.linodeAPIVersion)
+	client, err := linodeclient.NewLinodeClient(fmt.Sprintf("LinodeCOSI/%s", version.Version))
 	if err != nil {
 		return fmt.Errorf("unable to create new client: %w", err)
 	}

cmd/linode-cosi-driver/main_test.go

@@ -46,6 +46,7 @@ func TestRun(t *testing.T) {
 		t.Run(tc.testName, func(t *testing.T) {
 			t.Parallel()
 
+			os.Setenv("LINODE_TOKEN", "test")
 			noopLog := slog.New(slog.NewTextHandler(
 				io.Discard,
 				&slog.HandlerOptions{Level: slog.LevelError},

examples/linode-objectstorage.BucketClass.yaml

@@ -5,7 +5,7 @@ metadata:
 driverName: objectstorage.cosi.linode.com
 deletionPolicy: Delete
 parameters:
-  cosi.linode.com/v1/region: us-east
+  cosi.linode.com/v1/region: us-ord
   cosi.linode.com/v1/acl: private
   cosi.linode.com/v1/cors: disabled
   cosi.linode.com/v1/policy: |-

helm/linode-cosi-driver/templates/Secret.yaml

@@ -15,7 +15,7 @@ type: Opaque
 data:
   LINODE_TOKEN: {{ required "value 'apiToken' required" .Values.apiToken | b64enc }}
   {{- if .Values.linodeApiUrl }}
-  LINODE_API_URL: {{ .Values.linodeApiUrl | b64enc }}
+  LINODE_URL: {{ .Values.linodeApiUrl | b64enc }}
   {{- end }}
   {{- if .Values.linodeApiVersion }}
   LINODE_API_VERSION: {{ .Values.linodeApiVersion | b64enc }}

pkg/linodeclient/linodeclient.go

@@ -41,23 +41,18 @@ type Client interface {
 	ListObjectStorageEndpoints(context.Context, *linodego.ListOptions) ([]linodego.ObjectStorageEndpoint, error)
 }
 
-// NewLinodeClient takes token, userAgent prefix, and API URL and after initial validation
+// NewLinodeClient takes userAgent prefix after initial validation
 // returns new linodego Client. The client uses linodego built-in http client
 // which supports setting root CA cert.
-func NewLinodeClient(token, ua, apiURL, apiVersion string) (*linodego.Client, error) {
-	linodeClient := linodego.NewClient(nil)
-	linodeClient.SetUserAgent(ua)
-	linodeClient.SetToken(token)
-
-	if apiURL != "" {
-		linodeClient.SetBaseURL(apiURL)
+func NewLinodeClient(ua string) (*linodego.Client, error) {
+	linodeClient, err := linodego.NewClientFromEnv(nil)
+	if err != nil {
+		return nil, fmt.Errorf("failed to create linode client from env: %w", err)
 	}
 
-	if apiVersion != "" {
-		linodeClient.SetAPIVersion(apiVersion)
-	}
+	linodeClient.SetUserAgent(ua)
 
-	return &linodeClient, nil
+	return linodeClient, nil
 }
 
 func NewEphemeralS3Credentials(

pkg/linodeclient/linodeclient_test.go

@@ -16,6 +16,7 @@ package linodeclient
 
 import (
 	"errors"
+	"os"
 	"testing"
 )
 
@@ -33,14 +34,6 @@ func TestNewLinodeClient(t *testing.T) {
 		{
 			testName: "simple",
 		},
-		{
-			testName:  "with user agent",
-			userAgent: "test_UA",
-		},
-		{
-			testName: "with token",
-			token:    "test_TOKEN",
-		},
 		{
 			testName: "with URL",
 			url:      "https://example.com",
@@ -72,8 +65,11 @@ func TestNewLinodeClient(t *testing.T) {
 
 		t.Run(tc.testName, func(t *testing.T) {
 			t.Parallel()
+			os.Setenv("LINODE_TOKEN", "TEST_TOKEN")
+			os.Setenv("LINODE_URL", tc.url)
+			os.Setenv("LINODE_API_VERSION", tc.version)
 
-			_, err := NewLinodeClient(tc.token, tc.userAgent, tc.url, tc.version)
+			_, err := NewLinodeClient(tc.userAgent)
 			if !errors.Is(err, tc.expectedError) {
 				t.Errorf("expected error: %v, but got: %v", tc.expectedError, err)
 			}

pkg/servers/provisioner/provisionerintegration_test.go

@@ -44,22 +44,16 @@ func TestHappyPath(t *testing.T) {
 	t.Parallel()
 
 	var (
-		linodeToken      = envflag.String("LINODE_TOKEN", "")
-		linodeURL        = envflag.String("LINODE_API_URL", "")
-		linodeAPIVersion = envflag.String("LINODE_API_VERSION", "")
-		iterations       = envflag.Int("IDEMPOTENCY_ITERATIONS", 2)
+		linodeToken = envflag.String("LINODE_TOKEN", "")
+		iterations  = envflag.Int("IDEMPOTENCY_ITERATIONS", 2)
 	)
 
 	if linodeToken == "" {
 		t.Errorf("LINODE_TOKEN not set")
 		return
 	}
 
-	client, err := linodeclient.NewLinodeClient(
-		linodeToken,
-		fmt.Sprintf("LinodeCOSI/%s+integration", version.Version),
-		linodeURL,
-		linodeAPIVersion)
+	client, err := linodeclient.NewLinodeClient(fmt.Sprintf("LinodeCOSI/%s+integration", version.Version))
 	if err != nil {
 		t.Errorf("failed to create client: %v", err.Error())
 		return

test/e2e/cosi/chainsaw-test.yaml

@@ -29,7 +29,7 @@ spec:
           driverName: objectstorage.cosi.linode.com
           deletionPolicy: Delete
           parameters:
-            cosi.linode.com/v1/region: us-east
+            cosi.linode.com/v1/region: us-ord
             cosi.linode.com/v1/acl: private
             cosi.linode.com/v1/cors: disabled
     - apply:

test/e2e/sample-app/resources/bucketclass-apply.yaml

@@ -5,7 +5,7 @@ metadata:
 driverName: objectstorage.cosi.linode.com
 deletionPolicy: Delete
 parameters:
-  cosi.linode.com/v1/region: us-east
+  cosi.linode.com/v1/region: us-ord
   cosi.linode.com/v1/policy: |-
     {
       "Version": "2012-10-17",