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

Epic/secretsmanage #148

Merged
merged 59 commits into from
Jul 12, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
59 commits
Select commit Hold shift + click to select a range
28446e3
feat: WIP work in progress, env variables not working in yaml
nvyasadobe May 2, 2024
33c4e74
WIP - eod commit - yaml enablement
nvyasadobe May 2, 2024
0bd4fc3
lint fix
nvyasadobe May 2, 2024
f1297e0
Removed static changes in devConsole
nvyasadobe May 3, 2024
d10d231
update command - secrets management changes
nvyasadobe May 3, 2024
bc03ea6
tests fix and utils logic changes
nvyasadobe May 7, 2024
503a6ad
lint fixes
nvyasadobe May 7, 2024
8716157
Added secrets validation
nvyasadobe May 8, 2024
126e9e5
defualt value of secrets set to false
nvyasadobe May 8, 2024
17cc162
reverted local run command changes as this is not part of this ticket
nvyasadobe May 8, 2024
a668f84
minor revert
nvyasadobe May 8, 2024
2181392
minor corrections
nvyasadobe May 8, 2024
4a41c37
Minor changes in messaging
nvyasadobe May 9, 2024
6884f2b
Bumped up version
nvyasadobe May 9, 2024
6b93b0b
Merge pull request #134 from adobe/release/3.3.0-edge-mesh
amolina-adobe May 9, 2024
b78d1b3
address review comments + parseEnv config changed to dollar-both
nvyasadobe May 14, 2024
eab4065
break parsing into a seperate function
nvyasadobe May 14, 2024
58698c9
WIP - EOD works push
nvyasadobe May 14, 2024
030219c
Updated function name
nvyasadobe May 14, 2024
962382c
Merge pull request #135 from adobe/CEXT-3113-secrets-flag-cli
revanth0212 May 14, 2024
27eb5a9
Added tests + todays push
nvyasadobe May 15, 2024
7c03ed0
Merge branch 'epic/secretsmanage' of github.com:adobe/aio-cli-plugin-…
nvyasadobe May 15, 2024
3089bbe
Supporting files for tests
nvyasadobe May 15, 2024
3966417
Added validations
nvyasadobe May 16, 2024
2e8d512
Updated regex to restrict in windows + red colour code for errors
nvyasadobe May 16, 2024
74cc4e3
added more tests for batch var validation and address changes requested
nvyasadobe May 20, 2024
9bcd3b3
lix fixes
nvyasadobe May 20, 2024
91a84aa
EOD work
nvyasadobe May 20, 2024
137e709
Added test for macOs batch variable validation
nvyasadobe May 20, 2024
49d078b
Merge pull request #137 from adobe/CEXT-3114
revanth0212 May 21, 2024
84597dc
poc local dev working code
nvyasadobe May 21, 2024
2751a05
EOD commit
nvyasadobe May 21, 2024
0a9c7a7
write secrets file in artifact, read same for local development
nvyasadobe May 22, 2024
a3b14b0
Merge branch 'epic/secretsmanage' of github.com:adobe/aio-cli-plugin-…
nvyasadobe May 22, 2024
96dcfbc
Added tests
nvyasadobe May 22, 2024
711cfc8
lint fix
nvyasadobe May 22, 2024
7d94920
added docs
nvyasadobe May 22, 2024
625b6e4
minor change in test name
nvyasadobe May 22, 2024
78df026
Correction to make non secrets mesh to also run
nvyasadobe May 22, 2024
e55597f
Added try catch
nvyasadobe May 22, 2024
4fd22bf
Update src/helpers.js
revanth0212 May 23, 2024
e2d36a7
Update src/serverUtils.js
revanth0212 May 23, 2024
2ae2576
Merge pull request #138 from adobe/CEXT-3116-localdev-with-secrets
revanth0212 May 23, 2024
aade27b
Created branch from epicSecretsmanage, took pull from main branch so …
nvyasadobe Jun 10, 2024
4296d6d
Fixed the tests that were coming due to chalk.bold
nvyasadobe Jun 10, 2024
e842bc6
lint fix
nvyasadobe Jun 10, 2024
efee233
Merge pull request #140 from adobe/sync_secrets_epic_branch
revanth0212 Jun 10, 2024
af315d3
feat: secrets encryption from cli in create and update command. Tests…
nvyasadobe Jun 14, 2024
8e915fe
feat: fixed failing tests
nvyasadobe Jun 19, 2024
42076f8
Minor changes
nvyasadobe Jun 19, 2024
3fa4f38
lint fixes
nvyasadobe Jun 19, 2024
6ee9105
Added more tests and some check
nvyasadobe Jun 19, 2024
254dc6f
Address review comments
nvyasadobe Jun 20, 2024
4367252
Merge pull request #141 from adobe/secrets-encryption-from-cli
revanth0212 Jun 21, 2024
382fa30
Bumped up version for secrets management.
nvyasadobe Jun 26, 2024
fd9f2e3
Merge pull request #146 from adobe/version_bump_secretsmanage
revanth0212 Jun 26, 2024
318b2ad
fix:resolve conflicts
AjazSumaiya Jul 12, 2024
47464fa
chore: updated packages
AjazSumaiya Jul 12, 2024
03bf64d
fix:updated version to beta
AjazSumaiya Jul 12, 2024
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
12 changes: 7 additions & 5 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@adobe/aio-cli-plugin-api-mesh",
"version": "3.4.0",
"version": "3.5.0-beta.1",
"description": "Adobe I/O CLI plugin to develop and manage API mesh sources",
"keywords": [
"oclif-plugin"
Expand Down Expand Up @@ -37,13 +37,13 @@
"version": "oclif-dev readme && git add README.md"
},
"dependencies": {
"@adobe-apimesh/mesh-builder": "1.5.0",
"@adobe-apimesh/mesh-builder": "1.6.0",
"@adobe/aio-cli-lib-console": "^4.0.0",
"@adobe/aio-lib-core-config": "^3.0.0",
"@adobe/aio-lib-core-logging": "^2.0.0",
"@adobe/aio-lib-env": "^2.0.0",
"@adobe/aio-lib-ims": "^6.0.1",
"@adobe/plugin-hooks": "0.1.1",
"@adobe/plugin-hooks": "0.3.0",
"@adobe/plugin-on-fetch": "0.1.0",
"@graphql-mesh/cli": "0.82.30",
"@graphql-mesh/graphql": "0.34.13",
Expand All @@ -52,6 +52,7 @@
"@graphql-mesh/plugin-http-details-extensions": "0.1.21",
"@graphql-mesh/runtime": "0.46.21",
"@graphql-mesh/soap": "0.14.25",
"@graphql-mesh/store": "0.9.20",
"@graphql-mesh/transform-encapsulate": "0.4.21",
"@graphql-mesh/transform-federation": "0.11.14",
"@graphql-mesh/transform-filter-schema": "0.15.23",
Expand All @@ -64,7 +65,6 @@
"@graphql-mesh/transform-resolvers-composition": "0.13.20",
"@graphql-mesh/transform-type-merging": "0.5.20",
"@graphql-mesh/types": "0.91.12",
"@graphql-mesh/store": "0.9.20",
"@oclif/command": "^1.6.1",
"@oclif/config": "^1.15.1",
"@oclif/core": "^1.14.1",
Expand All @@ -74,6 +74,7 @@
"child_process": "^1.0.2",
"content-disposition": "^0.5.4",
"dotenv": "^16.0.3",
"envsub": "^4.1.0",
"eslint-plugin-promise": "^6.0.0",
"eslint-plugin-security": "^1.5.0",
"eslint-plugin-sonarjs": "^0.16.0",
Expand All @@ -92,7 +93,8 @@
"pupa": "^3.1.0",
"source-registry-storage-adapter": "github:devx-services/source-registry-storage-adapter#main",
"util": "^0.12.5",
"uuid": "^8.3.2"
"uuid": "^8.3.2",
"yaml": "^2.4.2"
},
"devDependencies": {
"@babel/eslint-parser": "^7.15.8",
Expand Down
18 changes: 18 additions & 0 deletions src/commands/__fixtures__/sample_secrets_mesh.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
{
"meshConfig": {
"sources": [
{
"name": "Commerce",
"handler": {
"graphql": {
"endpoint": "https://venia.magento.com/graphql",
"operationHeaders": {
"Authorization": "{context.secrets.Token}"
},
"useGETForQueries": true
}
}
}
]
}
}
3 changes: 3 additions & 0 deletions src/commands/__fixtures__/secrets_invalid.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
HOME: 'home'
TOKEN: "dummy-token"
TOKEN: "dummy-token-duplicate"
2 changes: 2 additions & 0 deletions src/commands/__fixtures__/secrets_valid.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
HOME: 'home'
TOKEN: "dummy-token"
4 changes: 4 additions & 0 deletions src/commands/__fixtures__/secrets_with_batch_variables.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
HOME: 'home'
TOKEN: "dummy-token"
batchHome: '$HOME'
USER: '${USER}'
Loading
Loading