Skip to content
This repository was archived by the owner on Oct 10, 2023. It is now read-only.

Commit cc02fdc

Browse files
committed
added an environment variable for testing
1 parent fe8dd98 commit cc02fdc

File tree

2 files changed

+10
-2
lines changed

2 files changed

+10
-2
lines changed
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
"AWS_AMI_ID: ami-012886bac01b37bae\nAWS_NODE_AZ: us-west-a\nAWS_NODE_AZ_1: \"\"\nAWS_NODE_AZ_2: \"\"\nAWS_PRIVATE_NODE_CIDR: \"\"\nAWS_PRIVATE_NODE_CIDR_1: \"\"\nAWS_PRIVATE_NODE_CIDR_2: \"\"\nAWS_PRIVATE_SUBNET_ID: sn4\nAWS_PRIVATE_SUBNET_ID_1: \"\"\nAWS_PRIVATE_SUBNET_ID_2: \"\"\nAWS_PROFILE: profile1\nAWS_PUBLIC_NODE_CIDR: \"\"\nAWS_PUBLIC_NODE_CIDR_1: \"\"\nAWS_PUBLIC_NODE_CIDR_2: \"\"\nAWS_PUBLIC_SUBNET_ID: sn1\nAWS_PUBLIC_SUBNET_ID_1: \"\"\nAWS_PUBLIC_SUBNET_ID_2: \"\"\nAWS_REGION: us-west-2\nAWS_SSH_KEY_NAME: myKeyPair\nAWS_VPC_CIDR: \"\"\nAWS_VPC_ID: vpc-1\nBASTION_HOST_ENABLED: \"true\"\nCLUSTER_ANNOTATIONS: 'description:,location:'\nCLUSTER_CIDR: 100.96.0.0/11\nCLUSTER_NAME: my-aws-name\nCLUSTER_PLAN: dev\nCONTROL_PLANE_MACHINE_TYPE: c6gn.medium\nENABLE_AUDIT_LOGGING: \"\"\nENABLE_CEIP_PARTICIPATION: \"true\"\nENABLE_MHC: \"false\"\nIDENTITY_MANAGEMENT_TYPE: none\nINFRASTRUCTURE_PROVIDER: aws\nLDAP_BIND_DN: \"\"\nLDAP_BIND_PASSWORD: \"\"\nLDAP_GROUP_SEARCH_BASE_DN: \"\"\nLDAP_GROUP_SEARCH_FILTER: \"\"\nLDAP_GROUP_SEARCH_GROUP_ATTRIBUTE: \"\"\nLDAP_GROUP_SEARCH_NAME_ATTRIBUTE: cn\nLDAP_GROUP_SEARCH_USER_ATTRIBUTE: DN\nLDAP_HOST: \"\"\nLDAP_ROOT_CA_DATA_B64: \"\"\nLDAP_USER_SEARCH_BASE_DN: \"\"\nLDAP_USER_SEARCH_FILTER: \"\"\nLDAP_USER_SEARCH_NAME_ATTRIBUTE: \"\"\nLDAP_USER_SEARCH_USERNAME: userPrincipalName\nNODE_MACHINE_TYPE: c6gn.medium\nOIDC_IDENTITY_PROVIDER_CLIENT_ID: \"\"\nOIDC_IDENTITY_PROVIDER_CLIENT_SECRET: \"\"\nOIDC_IDENTITY_PROVIDER_GROUPS_CLAIM: \"\"\nOIDC_IDENTITY_PROVIDER_ISSUER_URL: \"\"\nOIDC_IDENTITY_PROVIDER_NAME: \"\"\nOIDC_IDENTITY_PROVIDER_SCOPES: \"\"\nOIDC_IDENTITY_PROVIDER_USERNAME_CLAIM: \"\"\nOS_ARCH: amd64\nOS_NAME: amazon\nOS_VERSION: \"2\"\nSERVICE_CIDR: 100.64.0.0/13\nTKG_HTTP_PROXY_ENABLED: \"false\"\n"
1+
"AWS_AMI_ID: ami-09a464de0bba738ff\nAWS_B64ENCODED_CREDENTIALS: foobar\nAWS_NODE_AZ: us-west-a\nAWS_NODE_AZ_1: \"\"\nAWS_NODE_AZ_2: \"\"\nAWS_PRIVATE_NODE_CIDR: \"\"\nAWS_PRIVATE_NODE_CIDR_1: \"\"\nAWS_PRIVATE_NODE_CIDR_2: \"\"\nAWS_PRIVATE_SUBNET_ID: sn4\nAWS_PRIVATE_SUBNET_ID_1: \"\"\nAWS_PRIVATE_SUBNET_ID_2: \"\"\nAWS_PROFILE: profile1\nAWS_PUBLIC_NODE_CIDR: \"\"\nAWS_PUBLIC_NODE_CIDR_1: \"\"\nAWS_PUBLIC_NODE_CIDR_2: \"\"\nAWS_PUBLIC_SUBNET_ID: sn1\nAWS_PUBLIC_SUBNET_ID_1: \"\"\nAWS_PUBLIC_SUBNET_ID_2: \"\"\nAWS_REGION: us-west-2\nAWS_SSH_KEY_NAME: myKeyPair\nAWS_VPC_CIDR: \"\"\nAWS_VPC_ID: vpc-1\nBASTION_HOST_ENABLED: \"true\"\nCLUSTER_ANNOTATIONS: 'description:,location:'\nCLUSTER_CIDR: 100.96.0.0/11\nCLUSTER_NAME: my-aws-name\nCLUSTER_PLAN: dev\nCONTROL_PLANE_MACHINE_TYPE: c6gn.medium\nENABLE_AUDIT_LOGGING: \"\"\nENABLE_CEIP_PARTICIPATION: \"true\"\nENABLE_MHC: \"false\"\nIDENTITY_MANAGEMENT_TYPE: none\nINFRASTRUCTURE_PROVIDER: aws\nLDAP_BIND_DN: \"\"\nLDAP_BIND_PASSWORD: \"\"\nLDAP_GROUP_SEARCH_BASE_DN: \"\"\nLDAP_GROUP_SEARCH_FILTER: \"\"\nLDAP_GROUP_SEARCH_GROUP_ATTRIBUTE: \"\"\nLDAP_GROUP_SEARCH_NAME_ATTRIBUTE: cn\nLDAP_GROUP_SEARCH_USER_ATTRIBUTE: DN\nLDAP_HOST: \"\"\nLDAP_ROOT_CA_DATA_B64: \"\"\nLDAP_USER_SEARCH_BASE_DN: \"\"\nLDAP_USER_SEARCH_FILTER: \"\"\nLDAP_USER_SEARCH_NAME_ATTRIBUTE: \"\"\nLDAP_USER_SEARCH_USERNAME: userPrincipalName\nNODE_MACHINE_TYPE: c6gn.medium\nOIDC_IDENTITY_PROVIDER_CLIENT_ID: \"\"\nOIDC_IDENTITY_PROVIDER_CLIENT_SECRET: \"\"\nOIDC_IDENTITY_PROVIDER_GROUPS_CLAIM: \"\"\nOIDC_IDENTITY_PROVIDER_ISSUER_URL: \"\"\nOIDC_IDENTITY_PROVIDER_NAME: \"\"\nOIDC_IDENTITY_PROVIDER_SCOPES: \"\"\nOIDC_IDENTITY_PROVIDER_USERNAME_CLAIM: \"\"\nOS_ARCH: amd64\nOS_NAME: amazon\nOS_VERSION: \"2\"\nSERVICE_CIDR: 100.64.0.0/13\nTKG_HTTP_PROXY_ENABLED: \"false\"\n"

tkg/web/server/handlers/export.go

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@
44
package handlers
55

66
import (
7+
"os"
8+
79
"github.com/go-openapi/runtime/middleware"
810
yaml "gopkg.in/yaml.v3"
911

@@ -61,8 +63,14 @@ func (app *App) ExportAzureConfig(params azure.ExportTKGConfigForAzureParams) mi
6163
func (app *App) ExportAWSConfig(params aws.ExportTKGConfigForAWSParams) middleware.Responder {
6264
var config *tkgconfigproviders.AWSConfig
6365
var configString string
66+
var err error
67+
var encodedCreds string
6468

65-
encodedCreds, err := app.awsClient.EncodeCredentials()
69+
if os.Getenv("CLI_TEST_RUN") == "true" {
70+
encodedCreds = "foobar"
71+
} else {
72+
encodedCreds, err = app.awsClient.EncodeCredentials()
73+
}
6674
if err == nil {
6775
// create the provider object with the configuration data
6876
config, err = tkgconfigproviders.New(app.AppConfig.TKGConfigDir, app.TKGConfigReaderWriter).NewAWSConfig(params.Params, encodedCreds)

0 commit comments

Comments
 (0)