From 452115ba0e2d73e7193b8e4ecbe5b4af1fc195b5 Mon Sep 17 00:00:00 2001 From: Alex Hung Date: Fri, 15 Dec 2023 09:39:53 -0800 Subject: [PATCH 1/6] Use heredoc for source_code in sample.tf and doc example Add Artifactory provider to sample.tf --- docs/resources/workers_service.md | 11 +++++++- .../platform_workers_service/resource.tf | 11 +++++++- sample.tf | 26 ++++++++++++++++--- 3 files changed, 42 insertions(+), 6 deletions(-) diff --git a/docs/resources/workers_service.md b/docs/resources/workers_service.md index 9e7a3da..6c46b04 100644 --- a/docs/resources/workers_service.md +++ b/docs/resources/workers_service.md @@ -20,7 +20,16 @@ resource "platform_workers_service" "my-workers-service" { key = "my-workers-service" enabled = true description = "My workers service" - source_code = "export default async (context: PlatformContext, data: BeforeDownloadRequest): Promise => { console.log(await context.clients.platformHttp.get('/artifactory/api/system/ping')); console.log(await axios.get('https://my.external.resource')); return { status: 'DOWNLOAD_PROCEED', message: 'proceed', } }" + source_code = < => { + console.log(await context.clients.platformHttp.get('/artifactory/api/system/ping')); + console.log(await axios.get('https://my.external.resource')); + return { + status: 'DOWNLOAD_PROCEED', + message: 'proceed', + } +} +EOT action = "BEFORE_DOWNLOAD" filter_criteria = { diff --git a/examples/resources/platform_workers_service/resource.tf b/examples/resources/platform_workers_service/resource.tf index 3ce56e1..18afd1b 100644 --- a/examples/resources/platform_workers_service/resource.tf +++ b/examples/resources/platform_workers_service/resource.tf @@ -2,7 +2,16 @@ resource "platform_workers_service" "my-workers-service" { key = "my-workers-service" enabled = true description = "My workers service" - source_code = "export default async (context: PlatformContext, data: BeforeDownloadRequest): Promise => { console.log(await context.clients.platformHttp.get('/artifactory/api/system/ping')); console.log(await axios.get('https://my.external.resource')); return { status: 'DOWNLOAD_PROCEED', message: 'proceed', } }" + source_code = < => { + console.log(await context.clients.platformHttp.get('/artifactory/api/system/ping')); + console.log(await axios.get('https://my.external.resource')); + return { + status: 'DOWNLOAD_PROCEED', + message: 'proceed', + } +} +EOT action = "BEFORE_DOWNLOAD" filter_criteria = { diff --git a/sample.tf b/sample.tf index bc02764..dc5ff1d 100644 --- a/sample.tf +++ b/sample.tf @@ -2,14 +2,19 @@ terraform { required_providers { platform = { source = "registry.terraform.io/jfrog/platform" - version = "1.0.0" + version = "1.0.3" + } + + artifactory = { + source = "registry.terraform.io/jfrog/artifactory" + version = "10.0.0" } } } variable "jfrog_url" { type = string - default = "http://localhost:8081" + default = "https://partnership.jfrog.io" } provider "platform" { @@ -17,16 +22,29 @@ provider "platform" { // supply JFROG_ACCESS_TOKEN as env var } +resource "artifactory_local_generic_repository" "my-generic-local" { + key = "my-generic-local" +} + resource "platform_workers_service" "my-workers-service" { key = "my-workers-service" enabled = true description = "My workers service" - source_code = "export default async (context: PlatformContext, data: BeforeDownloadRequest): Promise => { console.log(await context.clients.platformHttp.get('/artifactory/api/system/ping')); console.log(await axios.get('https://my.external.resource')); return { status: 'DOWNLOAD_PROCEED', message: 'proceed', } }" + source_code = < => { + console.log(await context.clients.platformHttp.get('/artifactory/api/system/ping')); + console.log(await axios.get('https://my.external.resource')); + return { + status: 'DOWNLOAD_PROCEED', + message: 'proceed', + } +} +EOT action = "BEFORE_DOWNLOAD" filter_criteria = { artifact_filter_criteria = { - repo_keys = ["my-generic-local"] + repo_keys = [artifactory_local_generic_repository.my-generic-local.key] } } From ad6ca7cff31c73fc82a89c3bbc5848da8942b665 Mon Sep 17 00:00:00 2001 From: Alex Hung Date: Fri, 15 Dec 2023 09:58:01 -0800 Subject: [PATCH 2/6] Use correct non-existent JFrog URL --- sample.tf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sample.tf b/sample.tf index dc5ff1d..3619c5c 100644 --- a/sample.tf +++ b/sample.tf @@ -14,7 +14,7 @@ terraform { variable "jfrog_url" { type = string - default = "https://partnership.jfrog.io" + default = "https://myinstance.jfrog.io" } provider "platform" { From aa103a489c3441ab46b484071cbf08d8750a5457 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 19 Dec 2023 00:04:42 +0000 Subject: [PATCH 3/6] Bump golang.org/x/crypto from 0.16.0 to 0.17.0 Bumps [golang.org/x/crypto](https://github.com/golang/crypto) from 0.16.0 to 0.17.0. - [Commits](https://github.com/golang/crypto/compare/v0.16.0...v0.17.0) --- updated-dependencies: - dependency-name: golang.org/x/crypto dependency-type: indirect ... Signed-off-by: dependabot[bot] --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 4b13d0b..996e811 100644 --- a/go.mod +++ b/go.mod @@ -69,7 +69,7 @@ require ( github.com/vmihailenco/msgpack/v5 v5.4.1 // indirect github.com/vmihailenco/tagparser/v2 v2.0.0 // indirect github.com/zclconf/go-cty v1.14.1 // indirect - golang.org/x/crypto v0.16.0 // indirect + golang.org/x/crypto v0.17.0 // indirect golang.org/x/exp v0.0.0-20230809150735-7b3493d9a819 // indirect golang.org/x/mod v0.14.0 // indirect golang.org/x/net v0.17.0 // indirect diff --git a/go.sum b/go.sum index 1a502ba..41dff76 100644 --- a/go.sum +++ b/go.sum @@ -217,8 +217,8 @@ golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5y golang.org/x/crypto v0.3.1-0.20221117191849-2c476679df9a/go.mod h1:hebNnKkNXi2UzZN1eVRvBB7co0a+JxK6XbPiWVs/3J4= golang.org/x/crypto v0.7.0/go.mod h1:pYwdfH91IfpZVANVyUOhSIPZaFoJGxTFbZhFTx+dXZU= golang.org/x/crypto v0.13.0/go.mod h1:y6Z2r+Rw4iayiXXAIxJIDAJ1zMW4yaTpebo8fPOliYc= -golang.org/x/crypto v0.16.0 h1:mMMrFzRSCF0GvB7Ne27XVtVAaXLrPmgPC7/v0tkwHaY= -golang.org/x/crypto v0.16.0/go.mod h1:gCAAfMLgwOJRpTjQ2zCCt2OcSfYMTeZVSRtQlPC7Nq4= +golang.org/x/crypto v0.17.0 h1:r8bRNjWL3GshPW3gkd+RpvzWrZAwPS49OmTGZ/uhM4k= +golang.org/x/crypto v0.17.0/go.mod h1:gCAAfMLgwOJRpTjQ2zCCt2OcSfYMTeZVSRtQlPC7Nq4= golang.org/x/exp v0.0.0-20230809150735-7b3493d9a819 h1:EDuYyU/MkFXllv9QF9819VlI9a4tzGuCbhG0ExK9o1U= golang.org/x/exp v0.0.0-20230809150735-7b3493d9a819/go.mod h1:FXUEEKJgO7OQYeo8N01OfiKP8RXMtf6e8aTskBGqWdc= golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4= From 9c60686c1fe3c5f2313f157f262cba545d3ebd5d Mon Sep 17 00:00:00 2001 From: Alex Hung Date: Mon, 18 Dec 2023 16:21:23 -0800 Subject: [PATCH 4/6] Update sample.tf --- sample.tf | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/sample.tf b/sample.tf index 3619c5c..7fe27bc 100644 --- a/sample.tf +++ b/sample.tf @@ -2,12 +2,12 @@ terraform { required_providers { platform = { source = "registry.terraform.io/jfrog/platform" - version = "1.0.3" + version = "1.0.2" } artifactory = { source = "registry.terraform.io/jfrog/artifactory" - version = "10.0.0" + version = "10.0.2" } } } @@ -22,6 +22,11 @@ provider "platform" { // supply JFROG_ACCESS_TOKEN as env var } +provider "artifactory" { + url = "${var.jfrog_url}" + // supply JFROG_ACCESS_TOKEN as env var +} + resource "artifactory_local_generic_repository" "my-generic-local" { key = "my-generic-local" } From 07e8c02ff292388d34d25f7c3ef478e290a5f9df Mon Sep 17 00:00:00 2001 From: Alex Hung Date: Tue, 19 Dec 2023 09:34:11 -0800 Subject: [PATCH 5/6] Update sample.tf Revert back to not including Artifactory provider --- sample.tf | 22 ++++------------------ 1 file changed, 4 insertions(+), 18 deletions(-) diff --git a/sample.tf b/sample.tf index 7fe27bc..292192d 100644 --- a/sample.tf +++ b/sample.tf @@ -4,17 +4,12 @@ terraform { source = "registry.terraform.io/jfrog/platform" version = "1.0.2" } - - artifactory = { - source = "registry.terraform.io/jfrog/artifactory" - version = "10.0.2" - } } } variable "jfrog_url" { type = string - default = "https://myinstance.jfrog.io" + default = "https://partnership.jfrog.io" } provider "platform" { @@ -22,22 +17,13 @@ provider "platform" { // supply JFROG_ACCESS_TOKEN as env var } -provider "artifactory" { - url = "${var.jfrog_url}" - // supply JFROG_ACCESS_TOKEN as env var -} - -resource "artifactory_local_generic_repository" "my-generic-local" { - key = "my-generic-local" -} - resource "platform_workers_service" "my-workers-service" { key = "my-workers-service" enabled = true description = "My workers service" source_code = < => { - console.log(await context.clients.platformHttp.get('/artifactory/api/system/ping')); + console.log(await context.clients.platform Http.get('/artifactory/api/system/ping')); console.log(await axios.get('https://my.external.resource')); return { status: 'DOWNLOAD_PROCEED', @@ -45,11 +31,11 @@ export default async (context: PlatformContext, data: BeforeDownloadRequest): Pr } } EOT - action = "BEFORE_DOWNLOAD" + action = "BEFORE_DOWNLOAD" filter_criteria = { artifact_filter_criteria = { - repo_keys = [artifactory_local_generic_repository.my-generic-local.key] + repo_keys = ["my-generic-local"] } } From d1252f70dc7987fcaa9f9ce8f45cb64428622c00 Mon Sep 17 00:00:00 2001 From: Alex Hung Date: Tue, 19 Dec 2023 09:34:49 -0800 Subject: [PATCH 6/6] Update sample.tf Use non-existant JFrog instance URL --- sample.tf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sample.tf b/sample.tf index 292192d..87ec3aa 100644 --- a/sample.tf +++ b/sample.tf @@ -9,7 +9,7 @@ terraform { variable "jfrog_url" { type = string - default = "https://partnership.jfrog.io" + default = "https://my.jfrog.io" } provider "platform" {