diff --git a/.travis.yml b/.travis.yml index df66b802..bd2976cc 100644 --- a/.travis.yml +++ b/.travis.yml @@ -26,6 +26,7 @@ script: - cd $GOPATH/src/github.com/IBM/ibmcloud-storage-volume-lib - source secret.txt - sed -i "s/"It\(\"VPC"/"PIt\(\"VPC"/g" $GOPATH/src/github.com/IBM/ibmcloud-storage-volume-lib/e2e/vpc/vpc_create_six_volumes_attach_detach_delete_volumes.go +- sed -i "s/"It\(\"VPC"/"PIt\(\"VPC"/g" $GOPATH/src/github.com/IBM/ibmcloud-storage-volume-lib/e2e/vpc/vpc_create_volume_attach_detach_volume.go - sed -i "s/RIAAS_ENDPOINT_URL/"$RIAAS_ENDPOINT_URL"/g" $GOPATH/src/github.com/IBM/ibmcloud-storage-volume-lib/e2e/config/vpc-config.toml - sed -i "s/RESOURCE_GROUP/"$RESOURCE_GROUP"/g" $GOPATH/src/github.com/IBM/ibmcloud-storage-volume-lib/e2e/config/vpc-config.toml - sed -i "s/IAM_API_KEY/"$IAM_API_KEY"/g" $GOPATH/src/github.com/IBM/ibmcloud-storage-volume-lib/e2e/config/vpc-config.toml diff --git a/provider/utils/init_provider.go b/provider/utils/init_provider.go index fd6b47cc..e3a29798 100644 --- a/provider/utils/init_provider.go +++ b/provider/utils/init_provider.go @@ -142,7 +142,6 @@ func GenerateContextCredentials(conf *config.Config, providerID string, contextC slUser := conf.Softlayer.SoftlayerUsername slAPIKey := conf.Softlayer.SoftlayerAPIKey iamAPIKey := conf.Bluemix.IamAPIKey - vpcIamAPIKey := conf.VPC.APIKey // Select appropriate authentication strategy isSLProvider := providerID == conf.Softlayer.SoftlayerBlockProviderName || providerID == conf.Softlayer.SoftlayerFileProviderName @@ -150,13 +149,13 @@ func GenerateContextCredentials(conf *config.Config, providerID string, contextC case isSLProvider && !isEmptyStringValue(&slUser) && !isEmptyStringValue(&slAPIKey): return contextCredentialsFactory.ForIaaSAPIKey(util.SafeStringValue(&AccountID), slUser, slAPIKey, ctxLogger) - case (providerID == conf.VPC.VPCBlockProviderName): - return contextCredentialsFactory.ForIAMAccessToken(vpcIamAPIKey, ctxLogger) + case (conf.VPC != nil && providerID == conf.VPC.VPCBlockProviderName): + return contextCredentialsFactory.ForIAMAccessToken(conf.VPC.APIKey, ctxLogger) case isSLProvider && !isEmptyStringValue(&iamAPIKey): return contextCredentialsFactory.ForIAMAPIKey(AccountID, iamAPIKey, ctxLogger) - case (providerID == conf.IKS.IKSBlockProviderName): + case (conf.IKS != nil && providerID == conf.IKS.IKSBlockProviderName): return provider.ContextCredentials{}, nil // Get credentials in OpenSession method default: