From 38efa5a1abf23d60ad5baf68ebe1a1f79677d024 Mon Sep 17 00:00:00 2001 From: Anto Christopher <93177734+anto-deepsource@users.noreply.github.com> Date: Tue, 19 Mar 2024 11:38:22 +0530 Subject: [PATCH 1/7] add transformer meta with version Signed-off-by: Anto Christopher <93177734+anto-deepsource@users.noreply.github.com> --- types/transformer.go | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/types/transformer.go b/types/transformer.go index ae827ae..55a8936 100644 --- a/types/transformer.go +++ b/types/transformer.go @@ -39,3 +39,12 @@ type TransformerConfig struct { Files []string `json:"files"` Tools []string `json:"tools"` } + +type TransformerTool struct { + Name string `json:"name"` + Meta TransformerToolMeta `json:"meta"` +} + +type TransformerToolMeta struct { + Version string `json:"version"` +} From 4fea5bb92e7a67d192369d65eb10e5283c44e57d Mon Sep 17 00:00:00 2001 From: Anto Christopher <93177734+anto-deepsource@users.noreply.github.com> Date: Tue, 19 Mar 2024 11:41:35 +0530 Subject: [PATCH 2/7] Update transformer.go Signed-off-by: Anto Christopher <93177734+anto-deepsource@users.noreply.github.com> --- types/transformer.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/types/transformer.go b/types/transformer.go index 55a8936..4269e11 100644 --- a/types/transformer.go +++ b/types/transformer.go @@ -28,7 +28,7 @@ type MarvinTransformerConfig struct { BaseOID string `toml:"baseOID"` CheckoutOID string `toml:"checkoutOID"` TransformerCommand string `toml:"transformerCommand"` - TransformerTools []string `toml:"transformerTools"` + TransformerTools []TransformerTool `toml:"transformerTools"` DSConfigUpdated bool `toml:"dsConfigUpdated"` PatchCommit PatchCommit `toml:"patch_commit"` } From 052a20564c0093c56bcb80d22bc0f74bdb8384b5 Mon Sep 17 00:00:00 2001 From: "deepsource-enterprise-internal[bot]" <111794875+deepsource-enterprise-internal[bot]@users.noreply.github.com> Date: Tue, 19 Mar 2024 06:11:44 +0000 Subject: [PATCH 3/7] style: format code with Gofumpt This commit fixes the style issues introduced in 4fea5bb according to the output from Gofumpt. Details: https://github.com/DeepSourceCorp/artifacts/pull/191 --- types/transformer.go | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/types/transformer.go b/types/transformer.go index 4269e11..20b66fa 100644 --- a/types/transformer.go +++ b/types/transformer.go @@ -24,13 +24,13 @@ type TransformerResultCeleryTask struct { } type MarvinTransformerConfig struct { - RunID string `toml:"runID"` - BaseOID string `toml:"baseOID"` - CheckoutOID string `toml:"checkoutOID"` - TransformerCommand string `toml:"transformerCommand"` - TransformerTools []TransformerTool `toml:"transformerTools"` - DSConfigUpdated bool `toml:"dsConfigUpdated"` - PatchCommit PatchCommit `toml:"patch_commit"` + RunID string `toml:"runID"` + BaseOID string `toml:"baseOID"` + CheckoutOID string `toml:"checkoutOID"` + TransformerCommand string `toml:"transformerCommand"` + TransformerTools []TransformerTool `toml:"transformerTools"` + DSConfigUpdated bool `toml:"dsConfigUpdated"` + PatchCommit PatchCommit `toml:"patch_commit"` } type TransformerConfig struct { From 418f6bf4961ea30d61a51b67e33ea321dc31cc8f Mon Sep 17 00:00:00 2001 From: Anto Christopher <93177734+anto-deepsource@users.noreply.github.com> Date: Tue, 19 Mar 2024 11:45:33 +0530 Subject: [PATCH 4/7] Update transformer.go Signed-off-by: Anto Christopher <93177734+anto-deepsource@users.noreply.github.com> --- types/transformer.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/types/transformer.go b/types/transformer.go index 20b66fa..048e5ad 100644 --- a/types/transformer.go +++ b/types/transformer.go @@ -37,7 +37,7 @@ type TransformerConfig struct { ExcludePatterns []string `json:"exclude_patterns"` ExcludeFiles []string `json:"exclude_files"` Files []string `json:"files"` - Tools []string `json:"tools"` + Tools []TransformerTool `json:"tools"` } type TransformerTool struct { From f2acd7f42ef5e26d4d93c39e7f9228f723173dbc Mon Sep 17 00:00:00 2001 From: "deepsource-enterprise-internal[bot]" <111794875+deepsource-enterprise-internal[bot]@users.noreply.github.com> Date: Tue, 19 Mar 2024 06:15:41 +0000 Subject: [PATCH 5/7] style: format code with Gofumpt This commit fixes the style issues introduced in 418f6bf according to the output from Gofumpt. Details: https://github.com/DeepSourceCorp/artifacts/pull/191 --- types/transformer.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/types/transformer.go b/types/transformer.go index 048e5ad..5990c15 100644 --- a/types/transformer.go +++ b/types/transformer.go @@ -34,9 +34,9 @@ type MarvinTransformerConfig struct { } type TransformerConfig struct { - ExcludePatterns []string `json:"exclude_patterns"` - ExcludeFiles []string `json:"exclude_files"` - Files []string `json:"files"` + ExcludePatterns []string `json:"exclude_patterns"` + ExcludeFiles []string `json:"exclude_files"` + Files []string `json:"files"` Tools []TransformerTool `json:"tools"` } From f9aa4376bfb74c61e445b4efc67c82e1d8ddeef3 Mon Sep 17 00:00:00 2001 From: Anto Christopher <93177734+anto-deepsource@users.noreply.github.com> Date: Tue, 19 Mar 2024 14:19:30 +0530 Subject: [PATCH 6/7] Update transformer.go Signed-off-by: Anto Christopher <93177734+anto-deepsource@users.noreply.github.com> --- types/transformer.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/types/transformer.go b/types/transformer.go index 5990c15..ab151bf 100644 --- a/types/transformer.go +++ b/types/transformer.go @@ -28,7 +28,7 @@ type MarvinTransformerConfig struct { BaseOID string `toml:"baseOID"` CheckoutOID string `toml:"checkoutOID"` TransformerCommand string `toml:"transformerCommand"` - TransformerTools []TransformerTool `toml:"transformerTools"` + TransformerTools []string `toml:"transformerTools"` DSConfigUpdated bool `toml:"dsConfigUpdated"` PatchCommit PatchCommit `toml:"patch_commit"` } From 09f8eb0a23c93cb0be0f1c549dcf99ebd639c864 Mon Sep 17 00:00:00 2001 From: "deepsource-enterprise-internal[bot]" <111794875+deepsource-enterprise-internal[bot]@users.noreply.github.com> Date: Tue, 19 Mar 2024 08:49:39 +0000 Subject: [PATCH 7/7] style: format code with Gofumpt This commit fixes the style issues introduced in f9aa437 according to the output from Gofumpt. Details: https://github.com/DeepSourceCorp/artifacts/pull/191 --- types/transformer.go | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/types/transformer.go b/types/transformer.go index ab151bf..c14571f 100644 --- a/types/transformer.go +++ b/types/transformer.go @@ -24,13 +24,13 @@ type TransformerResultCeleryTask struct { } type MarvinTransformerConfig struct { - RunID string `toml:"runID"` - BaseOID string `toml:"baseOID"` - CheckoutOID string `toml:"checkoutOID"` - TransformerCommand string `toml:"transformerCommand"` - TransformerTools []string `toml:"transformerTools"` - DSConfigUpdated bool `toml:"dsConfigUpdated"` - PatchCommit PatchCommit `toml:"patch_commit"` + RunID string `toml:"runID"` + BaseOID string `toml:"baseOID"` + CheckoutOID string `toml:"checkoutOID"` + TransformerCommand string `toml:"transformerCommand"` + TransformerTools []string `toml:"transformerTools"` + DSConfigUpdated bool `toml:"dsConfigUpdated"` + PatchCommit PatchCommit `toml:"patch_commit"` } type TransformerConfig struct {