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.

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

chore(individual-pkg-gen): fix bug in setting alpha package visibility #16787

Merged
merged 3 commits into from
Oct 4, 2021

Conversation

njlynch
Copy link
Contributor

@njlynch njlynch commented Oct 4, 2021

The logic to remove the "private" marker for the alpha module package.jsons
was backported to master without any change or an appropriate qualifier. This
leads to the alpha packages being set to public on master, which is not what
we want. Rather than introduce v1- and v2-specific logic here, I opted to look
at the current package's setting, and swap it. The logic is that if we're
publishing aws-foobar, we don't want to publish aws-foobar-alpha, and vice
versa.

Also fixed a bug where alpha'ed packages were being re-alpha'ed when transform
was run multiple times in local development.


By submitting this pull request, I confirm that my contribution is made under the terms of the Apache-2.0 license

The logic to remove the "private" marker for the alpha module `package.json`s
was backported to `master` without any change or an appropriate qualifier. This
leads to the alpha packages being set to public on `master`, which is not what
we want. Rather than introduce v1- and v2-specific logic here, I opted to look
at the current package's setting, and swap it. The logic is that if we're
publishing `aws-foobar`, we don't want to publish `aws-foobar-alpha`, and vice
versa.

Also fixed a bug where alpha'ed packages were being re-alpha'ed when transform
was run multiple times in local development.
@njlynch njlynch requested a review from a team October 4, 2021 16:49
@njlynch njlynch self-assigned this Oct 4, 2021
@gitpod-io
Copy link

gitpod-io bot commented Oct 4, 2021

@mergify
Copy link
Contributor

mergify bot commented Oct 4, 2021

Thank you for contributing! Your pull request will be updated from master and then merged automatically (do not update manually, and be sure to allow changes to be pushed to your fork).

@aws-cdk-automation
Copy link
Collaborator

AWS CodeBuild CI Report

  • CodeBuild project: AutoBuildProject89A8053A-LhjRyN9kxr8o
  • Commit ID: 52ad2c8
  • Result: SUCCEEDED
  • Build Logs (available for 30 days)

Powered by github-codebuild-logs, available on the AWS Serverless Application Repository

@mergify mergify bot merged commit 89a5ed1 into master Oct 4, 2021
@mergify mergify bot deleted the njlynch/fix-private-alphas branch October 4, 2021 23:25
@mergify
Copy link
Contributor

mergify bot commented Oct 4, 2021

Thank you for contributing! Your pull request will be updated from master and then merged automatically (do not update manually, and be sure to allow changes to be pushed to your fork).

xykkong added a commit to xykkong/aws-cdk that referenced this pull request Oct 6, 2021
* '15588' of https://github.com/xykkong/aws-cdk: (47 commits)
  chore: rollback `GenericSSMParameterImage` deprecation (backport aws#16798) (aws#16800)
  chore(deps): bump actions/setup-node from 2.4.0 to 2.4.1 (aws#16778)
  Update CHANGELOG.md
  chore(release): 1.126.0
  feat(assertions): matcher support for `templateMatches()` API (aws#16789)
  feat(stepfunctions-tasks): add step concurrency level to EmrCreateCluster (aws#15242)
  docs(s3): correct heading levels Object Ownership / Bucket deletion (aws#16790)
  chore(individual-pkg-gen): fix bug in setting alpha package visibility (aws#16787)
  fix(s3): setting `autoDeleteObjects` to `false` empties the bucket (aws#16756)
  fix(iam): `User.fromUserArn` does not work for ARNs that include a path (aws#16269)
  fix(cli): progress bar overshoots count by 1 for stack updates (aws#16168)
  fix(config): add SourceAccount condition to Lambda permission (aws#16617)
  docs(events): add a note about not using `EventPattern` with `CfnRule` (aws#16715)
  docs(core): fix reference to nonexistant enum value (aws#16716)
  chore(s3-deployments): update python version on BucketDeployment handler (aws#16771)
  chore: set response-requested length to 2 and closing-soon to 5 (aws#16763)
  fix(revert): "fix: CDK does not honor NO_PROXY settings (aws#16751)" (aws#16761)
  docs(GitHub issue templates): Upgrade to GitHub Issues v2 (aws#16592)
  chore: reset jsii-rosetta worker count to default (aws#16755)
  fix: CDK does not honor NO_PROXY settings (aws#16751)
  ...
njlynch added a commit that referenced this pull request Oct 11, 2021
#16787)

The logic to remove the "private" marker for the alpha module `package.json`s
was backported to `master` without any change or an appropriate qualifier. This
leads to the alpha packages being set to public on `master`, which is not what
we want. Rather than introduce v1- and v2-specific logic here, I opted to look
at the current package's setting, and swap it. The logic is that if we're
publishing `aws-foobar`, we don't want to publish `aws-foobar-alpha`, and vice
versa.

Also fixed a bug where alpha'ed packages were being re-alpha'ed when transform
was run multiple times in local development.


----

*By submitting this pull request, I confirm that my contribution is made under the terms of the Apache-2.0 license*
TikiTDO pushed a commit to TikiTDO/aws-cdk that referenced this pull request Feb 21, 2022
aws#16787)

The logic to remove the "private" marker for the alpha module `package.json`s
was backported to `master` without any change or an appropriate qualifier. This
leads to the alpha packages being set to public on `master`, which is not what
we want. Rather than introduce v1- and v2-specific logic here, I opted to look
at the current package's setting, and swap it. The logic is that if we're
publishing `aws-foobar`, we don't want to publish `aws-foobar-alpha`, and vice
versa.

Also fixed a bug where alpha'ed packages were being re-alpha'ed when transform
was run multiple times in local development.


----

*By submitting this pull request, I confirm that my contribution is made under the terms of the Apache-2.0 license*
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
contribution/core This is a PR that came from AWS.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants