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

Add GitHub v2 Authentication to CodePipeline #16959

Merged
merged 6 commits into from
Jan 14, 2021
Merged

Add GitHub v2 Authentication to CodePipeline #16959

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
3f5b95a
Removes GitHub OAuth token hashing
gdavison Dec 11, 2020
d0793c2
Adds acceptance test for CodePipeline using CodeStar Connection sourc…
gdavison Dec 18, 2020
7824d0b
Separates GITHUB_TOKEN preCheck from CodePipeline service support pre…
gdavison Dec 18, 2020
a3bcc7e
Makes CodeStar Connection default for CodePipeline tests. GITHUB_TOKE…
gdavison Dec 19, 2020
e9d5ee7
Merge branch 'master' into b-codepipeline-github
gdavison Jan 4, 2021
4de8164
Restores diff suppression for hashed GitHub tokens
gdavison Jan 12, 2021
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
6 changes: 6 additions & 0 deletions aws/provider_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -779,6 +779,12 @@ func testAccPreCheckIamServiceLinkedRole(t *testing.T, pathPrefix string) {
}
}

func testAccEnvironmentVariableSetPreCheck(variable string, t *testing.T) {
Copy link
Contributor

Choose a reason for hiding this comment

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

Not for this PR, but we could replace some other acceptance testing environment handling we have if this could have a custom message (usually a description of what the environment variable is needed for) and this returned the value as well.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I've created #17083

if os.Getenv(variable) == "" {
t.Skipf("skipping tests; environment variable %s must be set", variable)
}
}

func testAccAlternateAccountProviderConfig() string {
//lintignore:AT004
return fmt.Sprintf(`
Expand Down
68 changes: 37 additions & 31 deletions aws/resource_aws_codepipeline.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,8 @@ import (

"github.com/aws/aws-sdk-go/aws"
"github.com/aws/aws-sdk-go/service/codepipeline"
"github.com/hashicorp/go-cty/cty"
"github.com/hashicorp/terraform-plugin-sdk/v2/diag"
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource"
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/validation"
Expand Down Expand Up @@ -59,11 +61,9 @@ func resourceAwsCodePipeline() *schema.Resource {
Required: true,
},
"type": {
Type: schema.TypeString,
Required: true,
ValidateFunc: validation.StringInSlice([]string{
codepipeline.ArtifactStoreTypeS3,
}, false),
Type: schema.TypeString,
Required: true,
ValidateFunc: validation.StringInSlice(codepipeline.ArtifactStoreType_Values(), false),
},
"encryption_key": {
Type: schema.TypeList,
Expand All @@ -76,11 +76,9 @@ func resourceAwsCodePipeline() *schema.Resource {
Required: true,
},
"type": {
Type: schema.TypeString,
Required: true,
ValidateFunc: validation.StringInSlice([]string{
codepipeline.EncryptionKeyTypeKms,
}, false),
Type: schema.TypeString,
Required: true,
ValidateFunc: validation.StringInSlice(codepipeline.EncryptionKeyType_Values(), false),
},
},
},
Expand Down Expand Up @@ -115,29 +113,19 @@ func resourceAwsCodePipeline() *schema.Resource {
DiffSuppressFunc: suppressCodePipelineStageActionConfiguration,
bflad marked this conversation as resolved.
Show resolved Hide resolved
},
"category": {
Type: schema.TypeString,
Required: true,
ValidateFunc: validation.StringInSlice([]string{
codepipeline.ActionCategorySource,
codepipeline.ActionCategoryBuild,
codepipeline.ActionCategoryDeploy,
codepipeline.ActionCategoryTest,
codepipeline.ActionCategoryInvoke,
codepipeline.ActionCategoryApproval,
}, false),
Type: schema.TypeString,
Required: true,
ValidateFunc: validation.StringInSlice(codepipeline.ActionCategory_Values(), false),
},
"owner": {
Type: schema.TypeString,
Required: true,
ValidateFunc: validation.StringInSlice([]string{
codepipeline.ActionOwnerAws,
codepipeline.ActionOwnerThirdParty,
codepipeline.ActionOwnerCustom,
}, false),
Type: schema.TypeString,
Required: true,
ValidateFunc: validation.StringInSlice(codepipeline.ActionOwner_Values(), false),
},
"provider": {
Type: schema.TypeString,
Required: true,
Type: schema.TypeString,
Required: true,
ValidateDiagFunc: resourceAwsCodePipelineValidateActionProvider,
},
"version": {
Type: schema.TypeString,
Expand Down Expand Up @@ -425,8 +413,7 @@ func flattenAwsCodePipelineStageActions(si int, actions []*codepipeline.ActionDe
if _, ok := config[CodePipelineGitHubActionConfigurationOAuthToken]; ok {
// The AWS API returns "****" for the OAuthToken value. Pull the value from the configuration.
addr := fmt.Sprintf("stage.%d.action.%d.configuration.OAuthToken", si, ai)
hash := hashCodePipelineGitHubToken(d.Get(addr).(string))
config[CodePipelineGitHubActionConfigurationOAuthToken] = hash
config[CodePipelineGitHubActionConfigurationOAuthToken] = d.Get(addr).(string)
}
}

Expand Down Expand Up @@ -620,6 +607,25 @@ func resourceAwsCodePipelineDelete(d *schema.ResourceData, meta interface{}) err
return err
}

func resourceAwsCodePipelineValidateActionProvider(i interface{}, path cty.Path) diag.Diagnostics {
v, ok := i.(string)
if !ok {
return diag.Errorf("expected type to be string")
}

if v == CodePipelineProviderGitHub {
return diag.Diagnostics{
diag.Diagnostic{
Severity: diag.Warning,
Summary: "The CodePipeline GitHub version 1 action provider is deprecated.",
Detail: "Use a GitHub version 2 action (with a CodeStar Connection `aws_codestarconnections_connection`) instead. See https://docs.aws.amazon.com/codepipeline/latest/userguide/update-github-action-connections.html",
},
}
}

return nil
}

func suppressCodePipelineStageActionConfiguration(k, old, new string, d *schema.ResourceData) bool {
parts := strings.Split(k, ".")
parts = parts[:len(parts)-2]
Expand Down
Loading