simplify config, remove cors middleware

equinor · Oct 10, 2024 · dc0f5e0 · dc0f5e0
1 parent 40e69ae
commit dc0f5e0
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 70 deletions.
diff --git a/.vscode/launch.json b/.vscode/launch.json
@@ -14,10 +14,7 @@
                 "RADIX_CONTAINER_REGISTRY":"radixdev.azurecr.io",
                 "PIPELINE_IMG_TAG": "master-latest",
                 "TEKTON_IMG_TAG": "main-latest",
-                "RADIX_CLUSTER_TYPE": "development",
                 "RADIX_DNS_ZONE":  "dev.radix.equinor.com",
-                "RADIX_CLUSTERNAME": "weekly-24",
-                "RADIX_ACTIVE_CLUSTER_EGRESS_IPS": "104.45.84.1",
                 "REQUIRE_APP_CONFIGURATION_ITEM": "true",
                 "REQUIRE_APP_AD_GROUPS": "true",
                 "RADIX_ENVIRONMENT":"qa",

diff --git a/api/middleware/cors/cors.go b/api/middleware/cors/cors.go
diff --git a/internal/config/config.go b/internal/config/config.go
@@ -18,18 +18,18 @@ type Config struct {
 	RequireAppADGroups          bool   `envconfig:"REQUIRE_APP_AD_GROUPS" default:"true"`
 	LogLevel                    string `envconfig:"LOG_LEVEL" default:"info"`
 	LogPrettyPrint              bool   `envconfig:"LOG_PRETTY" default:"false"`
-	ClusterName                 string `envconfig:"RADIX_CLUSTERNAME" required:"true"`
-	DNSZone                     string `envconfig:"RADIX_DNS_ZONE" required:"true"`
-	AzureOidc                   Oidc   `envconfig:"OIDC_AZURE" required:"true"`
-	KubernetesOidc              Oidc   `envconfig:"OIDC_KUBERNETES" required:"true"`
-	AppName                     string `envconfig:"RADIX_APP" required:"true"`
-	EnvironmentName             string `envconfig:"RADIX_ENVIRONMENT" required:"true"`
-	PrometheusUrl               string `envconfig:"PROMETHEUS_URL" required:"true"`
+
+	AppName         string `envconfig:"RADIX_APP" required:"true" desc:"Should be radix-api"`
+	EnvironmentName string `envconfig:"RADIX_ENVIRONMENT" required:"true" desc:"Should be qa or prod"`
+	DNSZone         string `envconfig:"RADIX_DNS_ZONE" required:"true" desc:"should be <env>.radix.equinor.com"`
+	AzureOidc       Oidc   `envconfig:"OIDC_AZURE" required:"true"`
+	KubernetesOidc  Oidc   `envconfig:"OIDC_KUBERNETES" required:"true"`
+	PrometheusUrl   string `envconfig:"PROMETHEUS_URL" required:"true"`
 }
 
 type Oidc struct {
-	Issuer   IssuerUrl `envconfig:"ISSUER" required:"true"`
-	Audience string    `envconfig:"Audience" required:"true"`
+	Issuer   url.URL `envconfig:"ISSUER" required:"true"`
+	Audience string  `envconfig:"Audience" required:"true"`
 }
 
 func MustParse() Config {

diff --git a/main.go b/main.go
@@ -76,12 +76,12 @@ func initializeServer(c config.Config) *http.Server {
 }
 
 func initializeTokenValidator(c config.Config) token.ValidatorInterface {
-	azureValidator, err := token.NewValidator(c.AzureOidc.Issuer.ToURL(), c.AzureOidc.Audience)
+	azureValidator, err := token.NewValidator(c.AzureOidc.Issuer, c.AzureOidc.Audience)
 	if err != nil {
 		log.Fatal().Err(err).Msg("Error creating JWT validator")
 	}
 
-	kubernetesValidator, err := token.NewValidator(c.KubernetesOidc.Issuer.ToURL(), c.KubernetesOidc.Audience)
+	kubernetesValidator, err := token.NewValidator(c.KubernetesOidc.Issuer, c.KubernetesOidc.Audience)
 	if err != nil {
 		log.Fatal().Err(err).Msg("Error creating JWT validator")
 	}