Skip to content

Bug 1684951: pkg/destroy/aws: Use GetSession() to prompt when missing #1365

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

Merged
openshift-merge-robot merged 1 commit into from
Apr 17, 2019
Merged

Bug 1684951: pkg/destroy/aws: Use GetSession() to prompt when missing #1365

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
7 changes: 7 additions & 0 deletions pkg/destroy/aws.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
package destroy

import (
session "github.com/openshift/installer/pkg/asset/installconfig/aws"
"github.com/openshift/installer/pkg/destroy/aws"
"github.com/openshift/installer/pkg/types"
"github.com/sirupsen/logrus"
Expand All @@ -13,11 +14,17 @@ func NewAWS(logger logrus.FieldLogger, metadata *types.ClusterMetadata) (Destroy
filters = append(filters, filter)
}

awsSession, err := session.GetSession()
if err != nil {
return nil, err
}

return &aws.ClusterUninstaller{
Filters: filters,
Region: metadata.ClusterPlatformMetadata.AWS.Region,
Logger: logger,
ClusterID: metadata.InfraID,
Session: awsSession,
}, nil
}

Expand Down
19 changes: 14 additions & 5 deletions pkg/destroy/aws/aws.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,11 @@ type ClusterUninstaller struct {
Logger logrus.FieldLogger
Region string
ClusterID string

// Session is the AWS session to be used for deletion. If nil, a
// new session will be created based on the usual credential
// configuration (AWS_PROFILE, AWS_ACCESS_KEY_ID, etc.).
Session *session.Session
}

func (o *ClusterUninstaller) validate() error {
Expand All @@ -73,11 +78,15 @@ func (o *ClusterUninstaller) Run() error {
}

awsConfig := &aws.Config{Region: aws.String(o.Region)}

// Relying on appropriate AWS ENV vars (eg AWS_PROFILE, AWS_ACCESS_KEY_ID, etc)
awsSession, err := session.NewSession(awsConfig)
if err != nil {
return err
awsSession := o.Session
if awsSession == nil {
// Relying on appropriate AWS ENV vars (eg AWS_PROFILE, AWS_ACCESS_KEY_ID, etc)
awsSession, err = session.NewSession(awsConfig)
if err != nil {
return err
}
} else {
awsSession = awsSession.Copy(awsConfig)
}
awsSession.Handlers.Build.PushBackNamed(request.NamedHandler{
Name: "openshiftInstaller.OpenshiftInstallerUserAgentHandler",
Expand Down