mirror of
https://github.com/drone-plugins/drone-docker.git
synced 2026-06-04 18:24:24 +08:00
Merge pull request #439 from Ompragash/patch-1
Added PLUGIN_OIDC_TOKEN_ID support
This commit is contained in:
@@ -42,6 +42,7 @@ func main() {
|
|||||||
assumeRole = getenv("PLUGIN_ASSUME_ROLE")
|
assumeRole = getenv("PLUGIN_ASSUME_ROLE")
|
||||||
externalId = getenv("PLUGIN_EXTERNAL_ID")
|
externalId = getenv("PLUGIN_EXTERNAL_ID")
|
||||||
scanOnPush = parseBoolOrDefault(false, getenv("PLUGIN_SCAN_ON_PUSH"))
|
scanOnPush = parseBoolOrDefault(false, getenv("PLUGIN_SCAN_ON_PUSH"))
|
||||||
|
idToken = os.Getenv("PLUGIN_OIDC_TOKEN_ID")
|
||||||
)
|
)
|
||||||
|
|
||||||
// set the region
|
// set the region
|
||||||
@@ -61,7 +62,7 @@ func main() {
|
|||||||
log.Fatal(fmt.Sprintf("error creating aws session: %v", err))
|
log.Fatal(fmt.Sprintf("error creating aws session: %v", err))
|
||||||
}
|
}
|
||||||
|
|
||||||
svc := getECRClient(sess, assumeRole, externalId)
|
svc := getECRClient(sess, assumeRole, externalId, idToken)
|
||||||
username, password, defaultRegistry, err := getAuthInfo(svc)
|
username, password, defaultRegistry, err := getAuthInfo(svc)
|
||||||
|
|
||||||
if registry == "" {
|
if registry == "" {
|
||||||
@@ -213,11 +214,15 @@ func getenv(key ...string) (s string) {
|
|||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
func getECRClient(sess *session.Session, role string, externalId string) *ecr.ECR {
|
func getECRClient(sess *session.Session, role string, externalId string, idToken string) *ecr.ECR {
|
||||||
if role == "" {
|
if role == "" {
|
||||||
return ecr.New(sess)
|
return ecr.New(sess)
|
||||||
}
|
}
|
||||||
if externalId != "" {
|
// Use STS AssumeRoleWithWebIdentity when idToken is provided
|
||||||
|
if idToken != "" {
|
||||||
|
creds := stscreds.NewWebIdentityCredentials(sess, role, "", idToken)
|
||||||
|
return ecr.New(sess, &aws.Config{Credentials: creds})
|
||||||
|
} else if externalId != "" {
|
||||||
return ecr.New(sess, &aws.Config{
|
return ecr.New(sess, &aws.Config{
|
||||||
Credentials: stscreds.NewCredentials(sess, role, func(p *stscreds.AssumeRoleProvider) {
|
Credentials: stscreds.NewCredentials(sess, role, func(p *stscreds.AssumeRoleProvider) {
|
||||||
p.ExternalID = &externalId
|
p.ExternalID = &externalId
|
||||||
|
|||||||
Reference in New Issue
Block a user