Revert "allow to strip webhooks uuids"

This reverts commit c154187.
rundeck · Jan 22, 2024 · 7be9db3 · 7be9db3
1 parent 9ae58c9
commit 7be9db3
Show file tree

Hide file tree

Showing 3 changed files with 0 additions and 10 deletions.
diff --git a/rd-api-client/src/main/java/org/rundeck/client/api/RundeckApi.java b/rd-api-client/src/main/java/org/rundeck/client/api/RundeckApi.java
@@ -411,7 +411,6 @@ Call<ProjectImportStatus> importProjectArchive(
             @Query("importScm") Boolean importScm,
             @Query("importWebhooks") Boolean importWebhooks,
             @Query("whkRegenAuthTokens") Boolean whkRegenAuthTokens,
-            @Query("whkRegenUuid") Boolean whkRegenUuid,
             @Query("importNodesSources") Boolean importNodesSources,
             @Query("asyncImport") Boolean asyncImport,
             @QueryMap Map<String,String> params,

diff --git a/rd-cli-tool/src/main/java/org/rundeck/client/tool/commands/projects/Archives.java b/rd-cli-tool/src/main/java/org/rundeck/client/tool/commands/projects/Archives.java
@@ -94,9 +94,6 @@ static class ArchiveImportOpts extends BaseOptions{
         @CommandLine.Option(names = {"-t", "--regenerate-tokens"}, description = "regenerate the auth tokens associated with the webhook in import, default: false (api v34 required)")
         boolean whkRegenAuthTokens;
 
-        @CommandLine.Option(names = {"-R", "--remove-webhooks-uuids"}, description = "Remove Webhooks UUIDs in import. Default: preserve webhooks UUIDs. (api v34 required)")
-        boolean whkRegenUuid;
-
         @CommandLine.Option(names = {"-n", "--include-node-sources"}, description = "Include node resources in import, default: false (api v38 required)")
         boolean includeNodeSources;
 
@@ -145,9 +142,6 @@ public int importArchive(@CommandLine.Mixin ArchiveImportOpts opts) throws Input
         if ((opts.isIncludeWebhooks() || opts.isWhkRegenAuthTokens()) && getRdTool().getClient().getApiVersion() < 34) {
             throw new InputError(String.format("Cannot use --include-webhooks or --regenerate-tokens with API < 34 (currently: %s)", getRdTool().getClient().getApiVersion()));
         }
-        if ((opts.isIncludeWebhooks() || opts.isWhkRegenUuid()) && getRdTool().getClient().getApiVersion() < 34) {
-            throw new InputError(String.format("Cannot use --include-webhooks or --remove-webhooks-uuids with API < 34 (currently: %s)", getRdTool().getClient().getApiVersion()));
-        }
         if ((opts.isIncludeNodeSources()) && getRdTool().getClient().getApiVersion() < 38) {
             throw new InputError(String.format("Cannot use --include-node-sources with API < 38 (currently: %s)", getRdTool().getClient().getApiVersion()));
         }
@@ -174,7 +168,6 @@ public int importArchive(@CommandLine.Mixin ArchiveImportOpts opts) throws Input
                 opts.isIncludeScm(),
                 opts.isIncludeWebhooks(),
                 opts.isWhkRegenAuthTokens(),
-                opts.isWhkRegenUuid(),
                 opts.isIncludeNodeSources(),
                 opts.isAsyncImportEnabled(),
                 extraCompOpts,

diff --git a/rd-cli-tool/src/test/groovy/org/rundeck/client/tool/commands/projects/ArchivesSpec.groovy b/rd-cli-tool/src/test/groovy/org/rundeck/client/tool/commands/projects/ArchivesSpec.groovy
@@ -71,7 +71,6 @@ class ArchivesSpec extends Specification {
                 _,
                 _,
                 _,
-                _,
                 [
                         'importComponents.test-comp': 'true',
                         'importOpts.test-comp.key'  : 'value',
@@ -202,7 +201,6 @@ class ArchivesSpec extends Specification {
                 _,
                 _,
                 _,
-                _,
                 [:],
                 _
         ) >> Calls.response(new ProjectImportStatus(resultsmap))
-Original file line number
+Diff line change
@@ Expand Up / @@ -71,7 +71,6 @@ class ArchivesSpec extends Specification { @@
                     _,
                     _,
                     _,
-                    _,
                     [
                             'importComponents.test-comp': 'true',
                             'importOpts.test-comp.key'  : 'value',
@@ Expand Down Expand Up / @@ -202,7 +201,6 @@ class ArchivesSpec extends Specification { @@
                     _,
                     _,
                     _,
-                    _,
                     [:],
                     _
             ) >> Calls.response(new ProjectImportStatus(resultsmap))
@@ Expand Down @@