Remove S3 params from AWS OIDC IdP set up script #51127
Conversation
This is dead code. We don't allow setting up the S3 buckets from the UI. They were also being ignored if used in the teleport command.
marcoandredinis
added
no-changelog
| // The script must execute the following command: | ||
| // teleport integration configure awsoidc-idp | ||
| argsList := []string{ | ||
| "integration", "configure", "awsoidc-idp", | ||
| fmt.Sprintf("--cluster=%s", shsprintf.EscapeDefaultContext(clusterName)), | ||
| fmt.Sprintf("--name=%s", shsprintf.EscapeDefaultContext(integrationName)), | ||
| fmt.Sprintf("--role=%s", shsprintf.EscapeDefaultContext(role)), | ||
| fmt.Sprintf("--proxy-public-url=%s", shsprintf.EscapeDefaultContext(proxyAddr)), |
There was a problem hiding this comment.
What is this for? The PR description makes it seem like it's not strictly related to dead code removal. ;)
There was a problem hiding this comment.
Instead of doing a argsList = append(argsList, "--proxy-public-url=%s"), I'm now adding it to the initial slice
We were appending here (note that s3Bucket and s3Prefix were always empty).
case s3Bucket == "" && s3Prefix == "":
proxyAddr, err := oidc.IssuerFromPublicAddress(h.cfg.PublicProxyAddr, "")
if err != nil {
return nil, trace.Wrap(err)
}
argsList = append(argsList,
fmt.Sprintf("--proxy-public-url=%s", shsprintf.EscapeDefaultContext(proxyAddr)),
)There was a problem hiding this comment.
Oh apologies, I didn't bother to Cmd+F proxy-public-url which would make my comment obsolete.
There was a problem hiding this comment.
As pointed out in https://github.com/gravitational/teleport/pull/51127/files#r1920312799, please update PR description as it only says to removes dead code but we are also adding some new code.
|
@marcoandredinis See the table below for backport results.
|
This is dead code. We don't allow setting up the S3 buckets from the UI. They were also being ignored if used in the teleport command.
This is dead code.
We don't allow setting up the S3 buckets from the UI. They were also being ignored if used in the teleport command.