Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Support alt namespace uuid as tenant id on swagger api creates/deletes #1091

Merged
merged 2 commits into from
Mar 20, 2020
Merged

Support alt namespace uuid as tenant id on swagger api creates/deletes #1091

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2c3171c
Support alt namespace resource uuid as tenant id on swagger api creat…
Mar 19, 2020
eeaae7b
Run go fmt on deployers/servicedeployers
Mar 19, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 16 additions & 4 deletions deployers/servicedeployer.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1014,9 +1014,9 @@ func (deployer *ServiceDeployer) createAction(pkgname string, action *whisk.Acti

func (deployer *ServiceDeployer) getAnnotationsFromPackageActionOrSequence(packageActionName string) *whisk.KeyValueArr {

if len(packageActionName)!=0 {
if len(packageActionName) != 0 {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

hehe

// Split the package name and action name being searched for
aActionName := strings.Split(packageActionName, parsers.PATH_SEPARATOR)
aActionName := strings.Split(packageActionName, parsers.PATH_SEPARATOR)

// Attempt to locate the named action (or sequence) to return its annotations
if pkg, found := deployer.Deployment.Packages[aActionName[0]]; found {
Expand Down Expand Up @@ -1088,8 +1088,14 @@ func (deployer *ServiceDeployer) createSwaggerApi(api *whisk.ApiCreateRequest) e
var response *http.Response

apiCreateReqOptions := deployer.Deployment.SwaggerApiOptions
apiCreateReqOptions.SpaceGuid = strings.Split(deployer.Client.Config.AuthToken, ":")[0]
apiCreateReqOptions.AccessToken = deployer.Client.Config.ApigwAccessToken
// In the case of IAM namespaces, we must use the ApigwTenantId as the SpaceGuid
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Applying the same IAM token (securekey) logic here as we have added elsewhere... LGTM

// IAM namespaces can be detected by seeing if the ApigwTenantId is populated
if len(deployer.Client.Config.ApigwTenantId) > 0 {
apiCreateReqOptions.SpaceGuid = deployer.Client.Config.ApigwTenantId
} else {
apiCreateReqOptions.SpaceGuid = strings.Split(deployer.Client.Config.AuthToken, ":")[0]
}

err = retry(DEFAULT_ATTEMPTS, DEFAULT_INTERVAL, func() error {
_, response, err = deployer.Client.Apis.Insert(api, apiCreateReqOptions, true)
Expand Down Expand Up @@ -1508,9 +1514,15 @@ func (deployer *ServiceDeployer) deleteSwaggerApi(api *whisk.ApiCreateRequest) e
}

apiDeleteReqOptions := new(whisk.ApiDeleteRequestOptions)
apiDeleteReqOptions.SpaceGuid = strings.Split(deployer.Client.Config.AuthToken, ":")[0]
apiDeleteReqOptions.AccessToken = deployer.Client.Config.ApigwAccessToken
apiDeleteReqOptions.ApiBasePath = swaggerObj.BasePath
// In the case of IAM namespaces, we must use the ApigwTenantId as the SpaceGuid
// IAM namespaces can be detected by seeing if the ApigwTenantId is populated
if len(deployer.Client.Config.ApigwTenantId) > 0 {
apiDeleteReqOptions.SpaceGuid = deployer.Client.Config.ApigwTenantId
} else {
apiDeleteReqOptions.SpaceGuid = strings.Split(deployer.Client.Config.AuthToken, ":")[0]
}

a := new(whisk.ApiDeleteRequest)
a.Swagger = swaggerString
Expand Down