Skip to content

Commit

Permalink
fix: upgraded eslint-tree version to remove console warning messages
Browse files Browse the repository at this point in the history
  • Loading branch information
gyalai-aws committed Apr 8, 2024
1 parent 60fd339 commit 283d71a
Show file tree
Hide file tree
Showing 28 changed files with 71 additions and 355 deletions.
4 changes: 2 additions & 2 deletions .github/ISSUE_TEMPLATE/bug-report.yml
Original file line number Diff line number Diff line change
Expand Up @@ -60,9 +60,9 @@ body:
validations:
required: false
- type: input
id: vp-version
id: wrapper-version
attributes:
label: Vanilla Pipeline Core version used
label: CDK CI/CD Wrapper version used
validations:
required: true
- type: input
Expand Down
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,5 @@
blank_issues_enabled: false
contact_links:
- name: 💬 General Question
url: https://github.com/dpp-epo-harvesting/harvesting-vanilla-pipeline-core/discussions/categories/q-a
url: https://github.com/.github/ISSUE_TEMPLATE/config.yml/discussions/categories/q-a
about: Please ask and answer questions as a discussion thread
6 changes: 0 additions & 6 deletions .github/ISSUE_TEMPLATE/feature-request.yml
Original file line number Diff line number Diff line change
Expand Up @@ -45,12 +45,6 @@ body:
required: false
- label: This feature might incur a breaking change
required: false
- type: input
id: vp-version
attributes:
label: Vanilla Pipeline Core version used
validations:
required: true
- type: input
id: environment
attributes:
Expand Down
25 changes: 18 additions & 7 deletions .projenrc.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,13 @@ import { TypeScriptWorkspace } from './projenrc/workspace';
const cdkVersion = '2.132.0';
const repositoryUrl = 'https://github.com/cdklabs/cdk-cicd-wrapper.git';

const eslintDeps = [
'eslint@^8',
'@typescript-eslint/eslint-plugin@^7',
'@typescript-eslint/parser@^7',
'@typescript-eslint/typescript-estree@^7',
];

const workflowRunsOn = [
// 'ubuntu-latest',
'awscdk-service-spec_ubuntu-latest_32-core',
Expand Down Expand Up @@ -95,21 +102,23 @@ const pipeline = new TypeScriptWorkspace({
keywords: ['cdk', 'aws-cdk', 'awscdk', 'aws', 'ci-cd-boot'],
releasableCommits: pj.ReleasableCommits.featuresAndFixes('.'),

devDeps: [`@aws-cdk/integ-runner@${cdkVersion}-alpha.0`, `@aws-cdk/integ-tests-alpha@${cdkVersion}-alpha.0`],
devDeps: [
`@aws-cdk/integ-runner@${cdkVersion}-alpha.0`,
`@aws-cdk/integ-tests-alpha@${cdkVersion}-alpha.0`,
'eslint@^8',
'@typescript-eslint/eslint-plugin@^7',
'@typescript-eslint/parser@^7',
'@typescript-eslint/typescript-estree@^7',
],

peerDeps: ['cdk-nag', 'aws-cdk-lib', 'constructs'],
bundledDeps: ['@cloudcomponents/cdk-pull-request-approval-rule', '@cloudcomponents/cdk-pull-request-check'],
jest: true,

// tsconfig: {
// extends: pj.javascript.TypescriptConfigExtends.fromTypescriptConfigs([root.tsconfig!]),
// compilerOptions: {}
// },
// disableTsconfig: true,
});

// Copy non TS sources to the package
pipeline.addDevDeps('copyfiles');
pipeline.addDevDeps(...eslintDeps);
pipeline.tasks.tryFind('post-compile')!.exec('copyfiles -u 1 -E src/**/*.py src/**/Pipfile src/**/Pipfile.lock lib');

// Copy bundle dependencies to the package
Expand Down Expand Up @@ -148,6 +157,8 @@ const cli = new TypeScriptWorkspace({
// Don't need to include the TypeScript source files in the tarball; the transpiled JS files are sufficient.
cli.addPackageIgnore('*.ts');

cli.addDevDeps(...eslintDeps);

const cliExec = cli.addTask('cli-exec');
cliExec.spawn(cli.tasks.tryFind('compile')!);
cliExec.exec('./packages/@cdklabs/cdk-cicd-wrapper-cli/bin/ci-cd-boot-cli', { receiveArgs: true, cwd: '../../..' });
Expand Down
10 changes: 5 additions & 5 deletions CONFIGVARS.md
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
# Configuration Variables
# Environment Variables

Vanilla Pipeline uses a configuration script, `scripts/configure.sh` to set up the configuration of the Vanilla Pipeline project. In addition to generating a script which can be sourced to your environment shell, this script also modifies `package.json` with certain configuration values.
CDK CI/CD Wrapper uses a environment variables, to set up the CDK projects with multi-stage deployment.

## Vanilla Pipeline Variables
## Variables

| ENV Variable | Package.json config | Default Value | Description |
|---|---|---|---|
Expand All @@ -14,8 +14,8 @@ Vanilla Pipeline uses a configuration script, `scripts/configure.sh` to set up t
| DEV_ACCOUNT_AWS_PROFILE | | | sets the named profile to use for the DEV account. this profile must exist in `~/.aws/credentials` or `~/.aws/config` |
| INT_ACCOUNT_AWS_PROFILE | | | sets the named profile to use for the INT account. this profile must exist in `~/.aws/credentials` or `~/.aws/config` |
| AWS_PROFILE | | | sets the default named profile to use for aws cli or cdk commands when no `--profile` is provided. set to the same value as `RES_ACCOUNT_AWS_PROFILE` this profile must exist in `~/.aws/credentials` or `~/.aws/config` |
| | applicationName | VanillaPipeline | sets the name of the Application |
| CDK_QUALIFIER | cdkQualifier | vanillap | used to distinguish between multiple deployments of a VP project in the same account. Good practice to customize per deployment. |
| | applicationName | Wrapper | sets the name of the Application |
| CDK_QUALIFIER | cdkQualifier | wrapper | used to distinguish between multiple deployments of a VP project in the same account. Good practice to customize per deployment. |
| GIT_REPOSITORY | repositoryName | | sets the name of the Git repository in the format org/name |
| | repositoryType | | sets the type of the repository, `GITHUB` or `CODECOMMIT` |
| CODESTAR_CONNECTION_ARN | | | sets the codestar connection required for GITHUB type |
Expand Down
206 changes: 0 additions & 206 deletions NOTICE
Original file line number Diff line number Diff line change
Expand Up @@ -25071,31 +25071,6 @@ MIT
SOFTWARE


@typescript-eslint/eslint-plugin 6.21.0
MIT
MIT License

Copyright (c) 2019 typescript-eslint and other contributors

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions:

The above copyright notice and this permission notice shall be included in all
copies or substantial portions of the Software.

THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.


@typescript-eslint/eslint-plugin 7.5.0
MIT
MIT License
Expand All @@ -25121,32 +25096,6 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.


@typescript-eslint/parser 6.21.0
BSD-2-Clause
TypeScript ESLint Parser
Copyright JS Foundation and other contributors, https://js.foundation

Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions are met:

- Redistributions of source code must retain the above copyright
notice, this list of conditions and the following disclaimer.
- Redistributions in binary form must reproduce the above copyright
notice, this list of conditions and the following disclaimer in the
documentation and/or other materials provided with the distribution.

THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
ARE DISCLAIMED. IN NO EVENT SHALL <COPYRIGHT HOLDER> BE LIABLE FOR ANY
DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.


@typescript-eslint/parser 7.5.0
BSD-2-Clause
TypeScript ESLint Parser
Expand All @@ -25173,31 +25122,6 @@ ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.


@typescript-eslint/scope-manager 6.21.0
MIT
MIT License

Copyright (c) 2019 typescript-eslint and other contributors

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions:

The above copyright notice and this permission notice shall be included in all
copies or substantial portions of the Software.

THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.


@typescript-eslint/scope-manager 7.5.0
MIT
MIT License
Expand All @@ -25223,31 +25147,6 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.


@typescript-eslint/type-utils 6.21.0
MIT
MIT License

Copyright (c) 2021 typescript-eslint and other contributors

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions:

The above copyright notice and this permission notice shall be included in all
copies or substantial portions of the Software.

THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.


@typescript-eslint/type-utils 7.5.0
MIT
MIT License
Expand All @@ -25273,31 +25172,6 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.


@typescript-eslint/types 6.21.0
MIT
MIT License

Copyright (c) 2019 typescript-eslint and other contributors

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions:

The above copyright notice and this permission notice shall be included in all
copies or substantial portions of the Software.

THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.


@typescript-eslint/types 7.5.0
MIT
MIT License
Expand All @@ -25323,36 +25197,6 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.


@typescript-eslint/typescript-estree 6.21.0
BSD-2-Clause
TypeScript ESTree

Originally extracted from:

TypeScript ESLint Parser
Copyright JS Foundation and other contributors, https://js.foundation

Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions are met:

- Redistributions of source code must retain the above copyright
notice, this list of conditions and the following disclaimer.
- Redistributions in binary form must reproduce the above copyright
notice, this list of conditions and the following disclaimer in the
documentation and/or other materials provided with the distribution.

THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
ARE DISCLAIMED. IN NO EVENT SHALL <COPYRIGHT HOLDER> BE LIABLE FOR ANY
DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.


@typescript-eslint/typescript-estree 7.5.0
BSD-2-Clause
TypeScript ESTree
Expand Down Expand Up @@ -25383,31 +25227,6 @@ ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.


@typescript-eslint/utils 6.21.0
MIT
MIT License

Copyright (c) 2019 typescript-eslint and other contributors

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions:

The above copyright notice and this permission notice shall be included in all
copies or substantial portions of the Software.

THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.


@typescript-eslint/utils 7.5.0
MIT
MIT License
Expand All @@ -25433,31 +25252,6 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.


@typescript-eslint/visitor-keys 6.21.0
MIT
MIT License

Copyright (c) 2019 typescript-eslint and other contributors

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions:

The above copyright notice and this permission notice shall be included in all
copies or substantial portions of the Software.

THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.


@typescript-eslint/visitor-keys 7.5.0
MIT
MIT License
Expand Down
4 changes: 2 additions & 2 deletions OSS_License_Summary.csv
Original file line number Diff line number Diff line change
Expand Up @@ -8,13 +8,13 @@
"(MIT OR GPL-3.0-or-later)","1"
"0BSD","2"
"Apache-2.0","133"
"BSD-2-Clause","15"
"BSD-2-Clause","13"
"BSD-3-Clause","25"
"CC-BY-3.0","1"
"CC-BY-4.0","1"
"CC0-1.0","1"
"ISC","62"
"MIT","709"
"MIT","703"
"Python-2.0","1"
"UNLICENSED","1"
"Unlicense","1"
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Welcome to the CI/CD Wrapper

The CI/CD Wrapper enables your CDK applications to be deployed with
This repository contain all the construct provided and used in the Vanilla Pipelin to build, test and deliver the packages through Private NPM Registries such as JFrog Artifactory or AWS CodeArtifact.
The CI/CD Wrapper gives you an easy way to deliver your CDK applications like a PRO.
This repository contain all the construct provided and used to build, test and deliver the CDK Applications through multiple stages, and AWS accounts to have high level of controlle over your Software Delivery pipelines.

The documentation for the {{ project_name }} Core is stored under the docs/ (index file: index.md) and is designed to be viewed as an MkDocs html site. Before heading to the documentation we highly recommend you:

Expand Down
Loading

0 comments on commit 283d71a

Please sign in to comment.