From 1753a1a4772034acac359262538da7f7666b540e Mon Sep 17 00:00:00 2001 From: Pulumi Bot <30351955+pulumi-bot@users.noreply.github.com> Date: Fri, 13 Sep 2024 21:07:34 +0100 Subject: [PATCH] Upgrade terraform-provider-artifactory to v11.9.2 (#884) This PR was generated via `$ upgrade-provider pulumi/pulumi-artifactory --kind=all --target-bridge-version=latest`. --- - Updating Java Gen version from 0.15.0 to 0.16.0. - Upgrading terraform-provider-artifactory from 11.9.1 to 11.9.2. Fixes #883 --- .pulumi-java-gen.version | 2 +- provider/cmd/pulumi-resource-artifactory/schema.json | 2 +- provider/go.mod | 4 ++-- provider/go.sum | 4 ++-- sdk/dotnet/PackageCleanupPolicy.cs | 4 +--- sdk/go/artifactory/packageCleanupPolicy.go | 4 +--- sdk/java/build.gradle | 2 +- .../java/com/pulumi/artifactory/PackageCleanupPolicy.java | 4 +--- sdk/nodejs/packageCleanupPolicy.ts | 4 +--- sdk/python/pulumi_artifactory/package_cleanup_policy.py | 8 ++------ 10 files changed, 13 insertions(+), 25 deletions(-) diff --git a/.pulumi-java-gen.version b/.pulumi-java-gen.version index 7092c7c46..d183d4ace 100644 --- a/.pulumi-java-gen.version +++ b/.pulumi-java-gen.version @@ -1 +1 @@ -0.15.0 \ No newline at end of file +0.16.0 \ No newline at end of file diff --git a/provider/cmd/pulumi-resource-artifactory/schema.json b/provider/cmd/pulumi-resource-artifactory/schema.json index 3848c0db9..098a5a539 100644 --- a/provider/cmd/pulumi-resource-artifactory/schema.json +++ b/provider/cmd/pulumi-resource-artifactory/schema.json @@ -30179,7 +30179,7 @@ } }, "artifactory:index/packageCleanupPolicy:PackageCleanupPolicy": { - "description": "Provides an Artifactory Package Cleanup Policy resource. This resource enable system administrators to define and customize policies based on specific criteria for removing unused binaries from across their JFrog platform. See [Retention Policies](https://jfrog.com/help/r/jfrog-platform-administration-documentation/retention-policies) for more details.\n\n-\u003eOnly available for Artifactory 7.90.1 or later.\n\n~\u003eCurrently in beta and not yet globally available. A full rollout is scheduled for early October 2024.\n\n## Example Usage\n\n\u003c!--Start PulumiCodeChooser --\u003e\n```java\npackage generated_program;\n\nimport com.pulumi.Context;\nimport com.pulumi.Pulumi;\nimport com.pulumi.core.Output;\nimport com.pulumi.artifactory.PackageCleanupPolicy;\nimport com.pulumi.artifactory.PackageCleanupPolicyArgs;\nimport com.pulumi.artifactory.inputs.PackageCleanupPolicySearchCriteriaArgs;\nimport java.util.List;\nimport java.util.ArrayList;\nimport java.util.Map;\nimport java.io.File;\nimport java.nio.file.Files;\nimport java.nio.file.Paths;\n\npublic class App {\n public static void main(String[] args) {\n Pulumi.run(App::stack);\n }\n\n public static void stack(Context ctx) {\n var my_cleanup_policy = new PackageCleanupPolicy(\"my-cleanup-policy\", PackageCleanupPolicyArgs.builder()\n .key(\"my-policy\")\n .description(\"My package cleanup policy\")\n .cronExpression(\"0 0 2 ? * MON-SAT *\")\n .durationInMinutes(60)\n .enabled(true)\n .skipTrashcan(false)\n .projectKey(\"myprojkey\")\n .searchCriteria(PackageCleanupPolicySearchCriteriaArgs.builder()\n .package_types( \n \"docker\",\n \"maven\")\n .repos( \n \"my-docker-local\",\n \"my-maven-local\")\n .excluded_repos(\"gradle-global\")\n .include_all_projects(false)\n .included_projects()\n .included_packages(\"com/jfrog\")\n .excluded_packages(\"com/jfrog/latest\")\n .created_before_in_months(1)\n .last_downloaded_before_in_months(6)\n .keep_last_n_versions(0)\n .build())\n .build());\n\n }\n}\n```\n```yaml\nresources:\n my-cleanup-policy:\n type: artifactory:PackageCleanupPolicy\n properties:\n key: my-policy\n description: My package cleanup policy\n cronExpression: 0 0 2 ? * MON-SAT *\n durationInMinutes: 60\n enabled: true\n skipTrashcan: false\n projectKey: myprojkey\n searchCriteria:\n package_types:\n - docker\n - maven\n repos:\n - my-docker-local\n - my-maven-local\n excluded_repos:\n - gradle-global\n include_all_projects: false\n included_projects: []\n included_packages:\n - com/jfrog\n excluded_packages:\n - com/jfrog/latest\n created_before_in_months: 1\n last_downloaded_before_in_months: 6\n keep_last_n_versions: 0\n```\n\u003c!--End PulumiCodeChooser --\u003e\n\n## Import\n\n```sh\n$ pulumi import artifactory:index/packageCleanupPolicy:PackageCleanupPolicy my-cleanup-policy my-policy\n```\n\n```sh\n$ pulumi import artifactory:index/packageCleanupPolicy:PackageCleanupPolicy my-cleanup-policy my-policy:myproj\n```\n\n", + "description": "Provides an Artifactory Package Cleanup Policy resource. This resource enable system administrators to define and customize policies based on specific criteria for removing unused binaries from across their JFrog platform. See [Rentation Policies](https://jfrog.com/help/r/jfrog-platform-administration-documentation/retention-policies) for more details.\n\n~\u003eCurrently in beta and not yet globally available. A full rollout is scheduled for early October 2024.\n\n## Example Usage\n\n\u003c!--Start PulumiCodeChooser --\u003e\n```java\npackage generated_program;\n\nimport com.pulumi.Context;\nimport com.pulumi.Pulumi;\nimport com.pulumi.core.Output;\nimport com.pulumi.artifactory.PackageCleanupPolicy;\nimport com.pulumi.artifactory.PackageCleanupPolicyArgs;\nimport com.pulumi.artifactory.inputs.PackageCleanupPolicySearchCriteriaArgs;\nimport java.util.List;\nimport java.util.ArrayList;\nimport java.util.Map;\nimport java.io.File;\nimport java.nio.file.Files;\nimport java.nio.file.Paths;\n\npublic class App {\n public static void main(String[] args) {\n Pulumi.run(App::stack);\n }\n\n public static void stack(Context ctx) {\n var my_cleanup_policy = new PackageCleanupPolicy(\"my-cleanup-policy\", PackageCleanupPolicyArgs.builder()\n .key(\"my-policy\")\n .description(\"My package cleanup policy\")\n .cronExpression(\"0 0 2 ? * MON-SAT *\")\n .durationInMinutes(60)\n .enabled(true)\n .skipTrashcan(false)\n .projectKey(\"myprojkey\")\n .searchCriteria(PackageCleanupPolicySearchCriteriaArgs.builder()\n .package_types( \n \"docker\",\n \"maven\")\n .repos( \n \"my-docker-local\",\n \"my-maven-local\")\n .excluded_repos(\"gradle-global\")\n .include_all_projects(false)\n .included_projects()\n .included_packages(\"com/jfrog\")\n .excluded_packages(\"com/jfrog/latest\")\n .created_before_in_months(1)\n .last_downloaded_before_in_months(6)\n .keep_last_n_versions(0)\n .build())\n .build());\n\n }\n}\n```\n```yaml\nresources:\n my-cleanup-policy:\n type: artifactory:PackageCleanupPolicy\n properties:\n key: my-policy\n description: My package cleanup policy\n cronExpression: 0 0 2 ? * MON-SAT *\n durationInMinutes: 60\n enabled: true\n skipTrashcan: false\n projectKey: myprojkey\n searchCriteria:\n package_types:\n - docker\n - maven\n repos:\n - my-docker-local\n - my-maven-local\n excluded_repos:\n - gradle-global\n include_all_projects: false\n included_projects: []\n included_packages:\n - com/jfrog\n excluded_packages:\n - com/jfrog/latest\n created_before_in_months: 1\n last_downloaded_before_in_months: 6\n keep_last_n_versions: 0\n```\n\u003c!--End PulumiCodeChooser --\u003e\n\n## Import\n\n```sh\n$ pulumi import artifactory:index/packageCleanupPolicy:PackageCleanupPolicy my-cleanup-policy my-policy\n```\n\n```sh\n$ pulumi import artifactory:index/packageCleanupPolicy:PackageCleanupPolicy my-cleanup-policy my-policy:myproj\n```\n\n", "properties": { "cronExpression": { "type": "string", diff --git a/provider/go.mod b/provider/go.mod index 4d150265d..f2ff2db80 100644 --- a/provider/go.mod +++ b/provider/go.mod @@ -1,6 +1,6 @@ module github.com/pulumi/pulumi-artifactory/provider/v7 -go 1.22.5 +go 1.22.7 replace ( github.com/hashicorp/go-getter v1.5.0 => github.com/hashicorp/go-getter v1.4.0 @@ -8,7 +8,7 @@ replace ( ) require ( - github.com/jfrog/terraform-provider-artifactory/v11 v11.9.1 + github.com/jfrog/terraform-provider-artifactory/v11 v11.9.2 github.com/pulumi/providertest v0.0.14 github.com/pulumi/pulumi-terraform-bridge/pf v0.43.0 github.com/pulumi/pulumi-terraform-bridge/v3 v3.90.0 diff --git a/provider/go.sum b/provider/go.sum index e4585a099..a286b20cb 100644 --- a/provider/go.sum +++ b/provider/go.sum @@ -1721,8 +1721,8 @@ github.com/inconshreveable/mousetrap v1.1.0 h1:wN+x4NVGpMsO7ErUn/mUI3vEoE6Jt13X2 github.com/inconshreveable/mousetrap v1.1.0/go.mod h1:vpF70FUmC8bwa3OWnCshd2FqLfsEA9PFc4w1p2J65bw= github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99 h1:BQSFePA1RWJOlocH6Fxy8MmwDt+yVQYULKfN0RoTN8A= github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99/go.mod h1:1lJo3i6rXxKeerYnT8Nvf0QmHCRC1n8sfWVwXF2Frvo= -github.com/jfrog/terraform-provider-artifactory/v11 v11.9.1 h1:ZeMPwToA7b722n6elbPpaUaa6J5XVBadRAz62I0WRY4= -github.com/jfrog/terraform-provider-artifactory/v11 v11.9.1/go.mod h1:g7GJysPJ7X2u8Il5wSAbUZxkcqdhZGEo03/NJMfe6gk= +github.com/jfrog/terraform-provider-artifactory/v11 v11.9.2 h1:zsANTWFJw8FuiWigYiyPOLSczHt4nBWEtjUL2j9aPKY= +github.com/jfrog/terraform-provider-artifactory/v11 v11.9.2/go.mod h1:lk28VDpgQXBinvuQWfIy9Hnpmyt2/axTnv0e/kYYvP0= github.com/jfrog/terraform-provider-shared v1.25.5 h1:+hal/9yDAIt2mZljDR8Ymie28yAHr8CAkfthwQ3O3bM= github.com/jfrog/terraform-provider-shared v1.25.5/go.mod h1:QthwPRUALElMt2RTGqoeB/3Vztx626YPBzIAoqEp0w0= github.com/jhump/gopoet v0.0.0-20190322174617-17282ff210b3/go.mod h1:me9yfT6IJSlOL3FCfrg+L6yzUEZ+5jW6WHt4Sk+UPUI= diff --git a/sdk/dotnet/PackageCleanupPolicy.cs b/sdk/dotnet/PackageCleanupPolicy.cs index ad2a6e7ea..58ed14cf0 100644 --- a/sdk/dotnet/PackageCleanupPolicy.cs +++ b/sdk/dotnet/PackageCleanupPolicy.cs @@ -10,9 +10,7 @@ namespace Pulumi.Artifactory { /// - /// Provides an Artifactory Package Cleanup Policy resource. This resource enable system administrators to define and customize policies based on specific criteria for removing unused binaries from across their JFrog platform. See [Retention Policies](https://jfrog.com/help/r/jfrog-platform-administration-documentation/retention-policies) for more details. - /// - /// ->Only available for Artifactory 7.90.1 or later. + /// Provides an Artifactory Package Cleanup Policy resource. This resource enable system administrators to define and customize policies based on specific criteria for removing unused binaries from across their JFrog platform. See [Rentation Policies](https://jfrog.com/help/r/jfrog-platform-administration-documentation/retention-policies) for more details. /// /// ~>Currently in beta and not yet globally available. A full rollout is scheduled for early October 2024. /// diff --git a/sdk/go/artifactory/packageCleanupPolicy.go b/sdk/go/artifactory/packageCleanupPolicy.go index 0caf10891..47735151c 100644 --- a/sdk/go/artifactory/packageCleanupPolicy.go +++ b/sdk/go/artifactory/packageCleanupPolicy.go @@ -12,9 +12,7 @@ import ( "github.com/pulumi/pulumi/sdk/v3/go/pulumi" ) -// Provides an Artifactory Package Cleanup Policy resource. This resource enable system administrators to define and customize policies based on specific criteria for removing unused binaries from across their JFrog platform. See [Retention Policies](https://jfrog.com/help/r/jfrog-platform-administration-documentation/retention-policies) for more details. -// -// ->Only available for Artifactory 7.90.1 or later. +// Provides an Artifactory Package Cleanup Policy resource. This resource enable system administrators to define and customize policies based on specific criteria for removing unused binaries from across their JFrog platform. See [Rentation Policies](https://jfrog.com/help/r/jfrog-platform-administration-documentation/retention-policies) for more details. // // ~>Currently in beta and not yet globally available. A full rollout is scheduled for early October 2024. // diff --git a/sdk/java/build.gradle b/sdk/java/build.gradle index 2230359ca..b12dbb93a 100644 --- a/sdk/java/build.gradle +++ b/sdk/java/build.gradle @@ -44,7 +44,7 @@ repositories { dependencies { implementation("com.google.code.findbugs:jsr305:3.0.2") implementation("com.google.code.gson:gson:2.8.9") - implementation("com.pulumi:pulumi:0.15.0") + implementation("com.pulumi:pulumi:0.16.0") } task sourcesJar(type: Jar) { diff --git a/sdk/java/src/main/java/com/pulumi/artifactory/PackageCleanupPolicy.java b/sdk/java/src/main/java/com/pulumi/artifactory/PackageCleanupPolicy.java index fd05c2977..aedd3c903 100644 --- a/sdk/java/src/main/java/com/pulumi/artifactory/PackageCleanupPolicy.java +++ b/sdk/java/src/main/java/com/pulumi/artifactory/PackageCleanupPolicy.java @@ -18,9 +18,7 @@ import javax.annotation.Nullable; /** - * Provides an Artifactory Package Cleanup Policy resource. This resource enable system administrators to define and customize policies based on specific criteria for removing unused binaries from across their JFrog platform. See [Retention Policies](https://jfrog.com/help/r/jfrog-platform-administration-documentation/retention-policies) for more details. - * - * ->Only available for Artifactory 7.90.1 or later. + * Provides an Artifactory Package Cleanup Policy resource. This resource enable system administrators to define and customize policies based on specific criteria for removing unused binaries from across their JFrog platform. See [Rentation Policies](https://jfrog.com/help/r/jfrog-platform-administration-documentation/retention-policies) for more details. * * ~>Currently in beta and not yet globally available. A full rollout is scheduled for early October 2024. * diff --git a/sdk/nodejs/packageCleanupPolicy.ts b/sdk/nodejs/packageCleanupPolicy.ts index f0dd59f7e..169279fd7 100644 --- a/sdk/nodejs/packageCleanupPolicy.ts +++ b/sdk/nodejs/packageCleanupPolicy.ts @@ -7,9 +7,7 @@ import * as outputs from "./types/output"; import * as utilities from "./utilities"; /** - * Provides an Artifactory Package Cleanup Policy resource. This resource enable system administrators to define and customize policies based on specific criteria for removing unused binaries from across their JFrog platform. See [Retention Policies](https://jfrog.com/help/r/jfrog-platform-administration-documentation/retention-policies) for more details. - * - * ->Only available for Artifactory 7.90.1 or later. + * Provides an Artifactory Package Cleanup Policy resource. This resource enable system administrators to define and customize policies based on specific criteria for removing unused binaries from across their JFrog platform. See [Rentation Policies](https://jfrog.com/help/r/jfrog-platform-administration-documentation/retention-policies) for more details. * * ~>Currently in beta and not yet globally available. A full rollout is scheduled for early October 2024. * diff --git a/sdk/python/pulumi_artifactory/package_cleanup_policy.py b/sdk/python/pulumi_artifactory/package_cleanup_policy.py index a2c20d588..0c89f8503 100644 --- a/sdk/python/pulumi_artifactory/package_cleanup_policy.py +++ b/sdk/python/pulumi_artifactory/package_cleanup_policy.py @@ -282,9 +282,7 @@ def __init__(__self__, skip_trashcan: Optional[pulumi.Input[bool]] = None, __props__=None): """ - Provides an Artifactory Package Cleanup Policy resource. This resource enable system administrators to define and customize policies based on specific criteria for removing unused binaries from across their JFrog platform. See [Retention Policies](https://jfrog.com/help/r/jfrog-platform-administration-documentation/retention-policies) for more details. - - ->Only available for Artifactory 7.90.1 or later. + Provides an Artifactory Package Cleanup Policy resource. This resource enable system administrators to define and customize policies based on specific criteria for removing unused binaries from across their JFrog platform. See [Rentation Policies](https://jfrog.com/help/r/jfrog-platform-administration-documentation/retention-policies) for more details. ~>Currently in beta and not yet globally available. A full rollout is scheduled for early October 2024. @@ -314,9 +312,7 @@ def __init__(__self__, args: PackageCleanupPolicyArgs, opts: Optional[pulumi.ResourceOptions] = None): """ - Provides an Artifactory Package Cleanup Policy resource. This resource enable system administrators to define and customize policies based on specific criteria for removing unused binaries from across their JFrog platform. See [Retention Policies](https://jfrog.com/help/r/jfrog-platform-administration-documentation/retention-policies) for more details. - - ->Only available for Artifactory 7.90.1 or later. + Provides an Artifactory Package Cleanup Policy resource. This resource enable system administrators to define and customize policies based on specific criteria for removing unused binaries from across their JFrog platform. See [Rentation Policies](https://jfrog.com/help/r/jfrog-platform-administration-documentation/retention-policies) for more details. ~>Currently in beta and not yet globally available. A full rollout is scheduled for early October 2024.