Skip to content

Commit

Permalink
Merge branch 'develop' into cross
Browse files Browse the repository at this point in the history
  • Loading branch information
mdial89f authored Jul 26, 2023
2 parents 9511b9b + e4d7ce9 commit 1628b91
Show file tree
Hide file tree
Showing 19 changed files with 10,963 additions and 6,644 deletions.
2 changes: 1 addition & 1 deletion .github/oidc/develop.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
[
{
"ParameterKey": "SubjectClaimFilters",
"ParameterValue": "repo:CMSgov/onemac:*"
"ParameterValue": "repo:Enterprise-CMCS/macpro-onemac:*"
},
{
"ParameterKey": "Path",
Expand Down
4 changes: 2 additions & 2 deletions .github/oidc/github-actions-oidc-template.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,10 @@ Parameters:
Default is audience for the official AWS configure action from https://github.com/aws-actions/configure-aws-credentials
SubjectClaimFilters:
Type: CommaDelimitedList
Default: "repo:CMSgov/onemac:*"
Default: "repo:Enterprise-CMCS/macpro-onemac:*"
Description: >
Subject claim filter for valid tokens.
Default allows any branch or tag of the CMSgov/onemac to assume the role.
Default allows any branch or tag of the Enterprise-CMCS/macpro-onemac to assume the role.
See https://docs.github.com/en/actions/deployment/security-hardening-your-deployments/about-security-hardening-with-openid-connect#example-subject-claims
for examples of fitlering by branch or deployment environment.
Path:
Expand Down
2 changes: 1 addition & 1 deletion .github/oidc/production.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
[
{
"ParameterKey": "SubjectClaimFilters",
"ParameterValue": "repo:CMSgov/onemac:ref:refs/heads/production"
"ParameterValue": "repo:Enterprise-CMCS/macpro-onemac:ref:refs/heads/production"
},
{
"ParameterKey": "Path",
Expand Down
2 changes: 1 addition & 1 deletion .github/oidc/val.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
[
{
"ParameterKey": "SubjectClaimFilters",
"ParameterValue": "repo:CMSgov/onemac:ref:refs/heads/master"
"ParameterValue": "repo:Enterprise-CMCS/macpro-onemac:ref:refs/heads/master"
},
{
"ParameterKey": "Path",
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# [OneMAC](https://github.com/CMSgov/onemac) [![Maintainability](https://api.codeclimate.com/v1/badges/2fd2de4673a78225e310/maintainability)](https://codeclimate.com/repos/610aa07d2929cc45c1004225/maintainability) [![Deploy](https://github.com/CMSgov/onemac/actions/workflows/deploy.yml/badge.svg)](https://github.com/CMSgov/onemac/actions/workflows/deploy.yml) [![Test Coverage](https://api.codeclimate.com/v1/badges/2fd2de4673a78225e310/test_coverage)](https://codeclimate.com/repos/610aa07d2929cc45c1004225/test_coverage)
# [OneMAC](https://github.com/Enterprise-CMCS/macpro-onemac) [![Maintainability](https://api.codeclimate.com/v1/badges/2fd2de4673a78225e310/maintainability)](https://codeclimate.com/repos/610aa07d2929cc45c1004225/maintainability) [![Deploy](https://github.com/Enterprise-CMCS/macpro-onemac/actions/workflows/deploy.yml/badge.svg)](https://github.com/Enterprise-CMCS/macpro-onemac/actions/workflows/deploy.yml) [![Test Coverage](https://api.codeclimate.com/v1/badges/2fd2de4673a78225e310/test_coverage)](https://codeclimate.com/repos/610aa07d2929cc45c1004225/test_coverage)

# macstack-spa-submission-form

Expand Down
8 changes: 4 additions & 4 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,14 +13,14 @@
"unsafe-perm": true,
"repository": {
"type": "git",
"url": "git+https://github.com/CMSgov/onemac.git"
"url": "git+https://github.com/Enterprise-CMCS/macpro-onemac.git"
},
"author": "",
"license": "CC0-1.0",
"bugs": {
"url": "https://github.com/CMSgov/onemac/issues"
"url": "https://github.com/Enterprise-CMCS/macpro-onemac/issues"
},
"homepage": "https://github.com/CMSgov/onemac#readme",
"homepage": "https://github.com/Enterprise-CMCS/macpro-onemac#readme",
"devDependencies": {
"@typescript-eslint/eslint-plugin": "^4.29.1",
"@typescript-eslint/parser": "^4.29.1",
Expand All @@ -41,7 +41,7 @@
"prettier": "^2.3.1",
"selenium-server": "^3.141.59",
"serverless": "3.12.0",
"serverless-s3-bucket-helper": "https://[email protected]/CMSgov/serverless-s3-bucket-helper#0.1.1",
"serverless-s3-bucket-helper": "https://[email protected]/Enterprise-CMCS/serverless-s3-bucket-helper#0.1.1",
"sinon": "^9.2.3",
"typescript": "^4.3.5"
},
Expand Down
66 changes: 28 additions & 38 deletions services/.sechub/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion services/.sechub/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
"license": "ISC",
"repository": {
"type": "git",
"url": "git+https://github.com/CMSgov/onemac.git"
"url": "git+https://github.com/Enterprise-CMCS/macpro-onemac.git"
},
"dependencies": {
"lodash": "^4.17.21",
Expand Down
Loading

0 comments on commit 1628b91

Please sign in to comment.