diff --git a/cipd_client_version b/cipd_client_version index 5d97e086b..6845811df 100644 --- a/cipd_client_version +++ b/cipd_client_version @@ -1 +1 @@ -git_revision:05844bd9d1200cba8449b936b76e25eb90eabe25 +git_revision:ac753ee37abd753a9a511210d3df362d003211f0 diff --git a/recipe_modules/cipd/api.py b/recipe_modules/cipd/api.py index 1d496a5eb..cb5406558 100644 --- a/recipe_modules/cipd/api.py +++ b/recipe_modules/cipd/api.py @@ -74,12 +74,12 @@ class CIPDApi(recipe_api.RecipeApi): [ self._cipd_executable, 'pkg-build', - '--in', input_dir, - '--name', package_name, - '--out', output_package, - '--json-output', self.m.json.output(), + '-in', input_dir, + '-name', package_name, + '-out', output_package, + '-json-output', self.m.json.output(), ] + ( - ['--install-mode', install_mode] if install_mode else [] + ['-install-mode', install_mode] if install_mode else [] ), step_test_data=lambda: self.test_api.example_build(package_name) ) @@ -90,16 +90,16 @@ class CIPDApi(recipe_api.RecipeApi): cmd = [ self._cipd_executable, 'pkg-register', package_path, - '--json-output', self.m.json.output(), + '-json-output', self.m.json.output(), ] if self._cipd_credentials: - cmd.extend(['--service-account-json', self._cipd_credentials]) + cmd.extend(['-service-account-json', self._cipd_credentials]) if refs: for ref in refs: - cmd.extend(['--ref', ref]) + cmd.extend(['-ref', ref]) if tags: for tag, value in sorted(tags.items()): - cmd.extend(['--tag', '%s:%s' % (tag, value)]) + cmd.extend(['-tag', '%s:%s' % (tag, value)]) return self.m.step( 'register %s' % package_name, cmd, @@ -115,17 +115,17 @@ class CIPDApi(recipe_api.RecipeApi): cmd = [ self._cipd_executable, 'create', - '--pkg-def', pkg_def, - '--json-output', self.m.json.output(), + '-pkg-def', pkg_def, + '-json-output', self.m.json.output(), ] if self._cipd_credentials: - cmd.extend(['--service-account-json', self._cipd_credentials]) + cmd.extend(['-service-account-json', self._cipd_credentials]) if refs: for ref in refs: - cmd.extend(['--ref', ref]) + cmd.extend(['-ref', ref]) if tags: for tag, value in sorted(tags.items()): - cmd.extend(['--tag', '%s:%s' % (tag, value)]) + cmd.extend(['-tag', '%s:%s' % (tag, value)]) return self.m.step('create %s' % self.m.path.basename(pkg_def), cmd) def ensure(self, root, packages): @@ -142,17 +142,17 @@ class CIPDApi(recipe_api.RecipeApi): package_list = ['%s %s' % (name, version) for name, version in sorted(packages.items())] - list_data = self.m.raw_io.input('\n'.join(package_list)) + ensure_file = self.m.raw_io.input('\n'.join(package_list)) cmd = [ self._cipd_executable, 'ensure', - '--root', root, - '--list', list_data, - '--json-output', self.m.json.output(), + '-root', root, + '-ensure-file', ensure_file, + '-json-output', self.m.json.output(), ] if self._cipd_credentials: - cmd.extend(['--service-account-json', self._cipd_credentials]) - return self.m.step( + cmd.extend(['-service-account-json', self._cipd_credentials]) + self.m.step( 'ensure_installed', cmd, step_test_data=lambda: self.test_api.example_ensure(packages) ) @@ -163,13 +163,13 @@ class CIPDApi(recipe_api.RecipeApi): cmd = [ self._cipd_executable, 'set-tag', package_name, - '--version', version, - '--json-output', self.m.json.output(), + '-version', version, + '-json-output', self.m.json.output(), ] if self._cipd_credentials: - cmd.extend(['--service-account-json', self._cipd_credentials]) + cmd.extend(['-service-account-json', self._cipd_credentials]) for tag, value in sorted(tags.items()): - cmd.extend(['--tag', '%s:%s' % (tag, value)]) + cmd.extend(['-tag', '%s:%s' % (tag, value)]) return self.m.step( 'cipd set-tag %s' % package_name, @@ -185,13 +185,13 @@ class CIPDApi(recipe_api.RecipeApi): cmd = [ self._cipd_executable, 'set-ref', package_name, - '--version', version, - '--json-output', self.m.json.output(), + '-version', version, + '-json-output', self.m.json.output(), ] if self._cipd_credentials: - cmd.extend(['--service-account-json', self._cipd_credentials]) + cmd.extend(['-service-account-json', self._cipd_credentials]) for r in refs: - cmd.extend(['--ref', r]) + cmd.extend(['-ref', r]) return self.m.step( 'cipd set-ref %s' % package_name, @@ -208,11 +208,11 @@ class CIPDApi(recipe_api.RecipeApi): cmd = [ self._cipd_executable, 'search', package_name, - '--tag', tag, - '--json-output', self.m.json.output(), + '-tag', tag, + '-json-output', self.m.json.output(), ] if self._cipd_credentials: - cmd.extend(['--service-account-json', self._cipd_credentials]) + cmd.extend(['-service-account-json', self._cipd_credentials]) return self.m.step( 'cipd search %s %s' % (package_name, tag), @@ -227,11 +227,11 @@ class CIPDApi(recipe_api.RecipeApi): cmd = [ self._cipd_executable, 'describe', package_name, - '--version', version, - '--json-output', self.m.json.output(), + '-version', version, + '-json-output', self.m.json.output(), ] if self._cipd_credentials: - cmd.extend(['--service-account-json', self._cipd_credentials]) + cmd.extend(['-service-account-json', self._cipd_credentials]) return self.m.step( 'cipd describe %s' % package_name, diff --git a/recipe_modules/cipd/example.expected/basic.json b/recipe_modules/cipd/example.expected/basic.json index b477ef2ed..437ca664a 100644 --- a/recipe_modules/cipd/example.expected/basic.json +++ b/recipe_modules/cipd/example.expected/basic.json @@ -49,13 +49,13 @@ "cmd": [ "[START_DIR]/cipd/cipd", "ensure", - "--root", + "-root", "[START_DIR]/packages", - "--list", + "-ensure-file", "public/package/linux-amd64 7f751b2237df2fdf3c1405be00590fefffbaea2d", - "--json-output", + "-json-output", "/path/to/tmp/json", - "--service-account-json", + "-service-account-json", "/creds/service_accounts/service-account-cipd-builder.json" ], "name": "ensure_installed", @@ -76,11 +76,11 @@ "[START_DIR]/cipd/cipd", "search", "public/package/linux-amd64", - "--tag", + "-tag", "git_revision:40-chars-long-hash", - "--json-output", + "-json-output", "/path/to/tmp/json", - "--service-account-json", + "-service-account-json", "/creds/service_accounts/service-account-cipd-builder.json" ], "name": "cipd search public/package/linux-amd64 git_revision:40-chars-long-hash", @@ -101,11 +101,11 @@ "[START_DIR]/cipd/cipd", "describe", "public/package/linux-amd64", - "--version", + "-version", "40-chars-fake-of-the-package-instance_id", - "--json-output", + "-json-output", "/path/to/tmp/json", - "--service-account-json", + "-service-account-json", "/creds/service_accounts/service-account-cipd-builder.json" ], "name": "cipd describe public/package/linux-amd64", @@ -151,13 +151,13 @@ "cmd": [ "[START_DIR]/cipd/cipd", "ensure", - "--root", + "-root", "[START_DIR]/packages", - "--list", + "-ensure-file", "private/package/linux-amd64 latest\npublic/package/linux-amd64 7f751b2237df2fdf3c1405be00590fefffbaea2d", - "--json-output", + "-json-output", "/path/to/tmp/json", - "--service-account-json", + "-service-account-json", "fake-credentials.json" ], "name": "ensure_installed (2)", @@ -182,11 +182,11 @@ "[START_DIR]/cipd/cipd", "search", "private/package/linux-amd64", - "--tag", + "-tag", "key:value", - "--json-output", + "-json-output", "/path/to/tmp/json", - "--service-account-json", + "-service-account-json", "fake-credentials.json" ], "name": "cipd search private/package/linux-amd64 key:value", @@ -207,11 +207,11 @@ "[START_DIR]/cipd/cipd", "describe", "private/package/linux-amd64", - "--version", + "-version", "40-chars-fake-of-the-package-instance_id", - "--json-output", + "-json-output", "/path/to/tmp/json", - "--service-account-json", + "-service-account-json", "fake-credentials.json" ], "name": "cipd describe private/package/linux-amd64", @@ -252,13 +252,13 @@ "cmd": [ "[START_DIR]/cipd/cipd", "pkg-build", - "--in", + "-in", "fake-input-dir", - "--name", + "-name", "infra/fake-package", - "--out", + "-out", "fake-package-path", - "--json-output", + "-json-output", "/path/to/tmp/json" ], "name": "build fake-package", @@ -276,15 +276,15 @@ "cmd": [ "[START_DIR]/cipd/cipd", "pkg-build", - "--in", + "-in", "fake-input-dir", - "--name", + "-name", "infra/fake-package", - "--out", + "-out", "fake-package-path", - "--json-output", + "-json-output", "/path/to/tmp/json", - "--install-mode", + "-install-mode", "copy" ], "name": "build fake-package (2)", @@ -303,17 +303,17 @@ "[START_DIR]/cipd/cipd", "pkg-register", "fake-package-path", - "--json-output", + "-json-output", "/path/to/tmp/json", - "--service-account-json", + "-service-account-json", "fake-credentials.json", - "--ref", + "-ref", "fake-ref-1", - "--ref", + "-ref", "fake-ref-2", - "--tag", + "-tag", "fake_tag_1:fake_value_1", - "--tag", + "-tag", "fake_tag_2:fake_value_2" ], "name": "register infra/fake-package", @@ -331,19 +331,19 @@ "cmd": [ "[START_DIR]/cipd/cipd", "create", - "--pkg-def", + "-pkg-def", "[START_DIR]/fake-package.yaml", - "--json-output", + "-json-output", "/path/to/tmp/json", - "--service-account-json", + "-service-account-json", "fake-credentials.json", - "--ref", + "-ref", "fake-ref-1", - "--ref", + "-ref", "fake-ref-2", - "--tag", + "-tag", "fake_tag_1:fake_value_1", - "--tag", + "-tag", "fake_tag_2:fake_value_2" ], "name": "create fake-package.yaml", @@ -357,15 +357,15 @@ "[START_DIR]/cipd/cipd", "set-tag", "fake-package", - "--version", + "-version", "long/weird/ref/which/doesn/not/fit/into/40chars", - "--json-output", + "-json-output", "/path/to/tmp/json", - "--service-account-json", + "-service-account-json", "fake-credentials.json", - "--tag", + "-tag", "dead:beaf", - "--tag", + "-tag", "more:value" ], "name": "cipd set-tag fake-package", @@ -387,15 +387,15 @@ "[START_DIR]/cipd/cipd", "set-ref", "fake-package", - "--version", + "-version", "latest", - "--json-output", + "-json-output", "/path/to/tmp/json", - "--service-account-json", + "-service-account-json", "fake-credentials.json", - "--ref", + "-ref", "any", - "--ref", + "-ref", "some" ], "name": "cipd set-ref fake-package", @@ -417,11 +417,11 @@ "[START_DIR]/cipd/cipd", "search", "fake-package/linux-amd64", - "--tag", + "-tag", "dead:beaf", - "--json-output", + "-json-output", "/path/to/tmp/json", - "--service-account-json", + "-service-account-json", "fake-credentials.json" ], "name": "cipd search fake-package/linux-amd64 dead:beaf", diff --git a/recipe_modules/cipd/example.expected/describe-failed.json b/recipe_modules/cipd/example.expected/describe-failed.json index 8158ce33d..a39a45b0f 100644 --- a/recipe_modules/cipd/example.expected/describe-failed.json +++ b/recipe_modules/cipd/example.expected/describe-failed.json @@ -49,13 +49,13 @@ "cmd": [ "[START_DIR]/cipd/cipd", "ensure", - "--root", + "-root", "[START_DIR]/packages", - "--list", + "-ensure-file", "public/package/linux-amd64 7f751b2237df2fdf3c1405be00590fefffbaea2d", - "--json-output", + "-json-output", "/path/to/tmp/json", - "--service-account-json", + "-service-account-json", "/creds/service_accounts/service-account-cipd-builder.json" ], "name": "ensure_installed", @@ -76,11 +76,11 @@ "[START_DIR]/cipd/cipd", "search", "public/package/linux-amd64", - "--tag", + "-tag", "git_revision:40-chars-long-hash", - "--json-output", + "-json-output", "/path/to/tmp/json", - "--service-account-json", + "-service-account-json", "/creds/service_accounts/service-account-cipd-builder.json" ], "name": "cipd search public/package/linux-amd64 git_revision:40-chars-long-hash", @@ -101,11 +101,11 @@ "[START_DIR]/cipd/cipd", "describe", "public/package/linux-amd64", - "--version", + "-version", "40-chars-fake-of-the-package-instance_id", - "--json-output", + "-json-output", "/path/to/tmp/json", - "--service-account-json", + "-service-account-json", "/creds/service_accounts/service-account-cipd-builder.json" ], "name": "cipd describe public/package/linux-amd64", diff --git a/recipe_modules/cipd/example.expected/describe-many-instances.json b/recipe_modules/cipd/example.expected/describe-many-instances.json index 142cd209d..00bebc037 100644 --- a/recipe_modules/cipd/example.expected/describe-many-instances.json +++ b/recipe_modules/cipd/example.expected/describe-many-instances.json @@ -49,13 +49,13 @@ "cmd": [ "[START_DIR]/cipd/cipd", "ensure", - "--root", + "-root", "[START_DIR]/packages", - "--list", + "-ensure-file", "public/package/linux-amd64 7f751b2237df2fdf3c1405be00590fefffbaea2d", - "--json-output", + "-json-output", "/path/to/tmp/json", - "--service-account-json", + "-service-account-json", "/creds/service_accounts/service-account-cipd-builder.json" ], "name": "ensure_installed", @@ -76,11 +76,11 @@ "[START_DIR]/cipd/cipd", "search", "public/package/linux-amd64", - "--tag", + "-tag", "git_revision:40-chars-long-hash", - "--json-output", + "-json-output", "/path/to/tmp/json", - "--service-account-json", + "-service-account-json", "/creds/service_accounts/service-account-cipd-builder.json" ], "name": "cipd search public/package/linux-amd64 git_revision:40-chars-long-hash", @@ -101,11 +101,11 @@ "[START_DIR]/cipd/cipd", "describe", "public/package/linux-amd64", - "--version", + "-version", "40-chars-fake-of-the-package-instance_id", - "--json-output", + "-json-output", "/path/to/tmp/json", - "--service-account-json", + "-service-account-json", "/creds/service_accounts/service-account-cipd-builder.json" ], "name": "cipd describe public/package/linux-amd64", @@ -151,13 +151,13 @@ "cmd": [ "[START_DIR]/cipd/cipd", "ensure", - "--root", + "-root", "[START_DIR]/packages", - "--list", + "-ensure-file", "private/package/linux-amd64 latest\npublic/package/linux-amd64 7f751b2237df2fdf3c1405be00590fefffbaea2d", - "--json-output", + "-json-output", "/path/to/tmp/json", - "--service-account-json", + "-service-account-json", "fake-credentials.json" ], "name": "ensure_installed (2)", @@ -182,11 +182,11 @@ "[START_DIR]/cipd/cipd", "search", "private/package/linux-amd64", - "--tag", + "-tag", "key:value", - "--json-output", + "-json-output", "/path/to/tmp/json", - "--service-account-json", + "-service-account-json", "fake-credentials.json" ], "name": "cipd search private/package/linux-amd64 key:value", @@ -207,11 +207,11 @@ "[START_DIR]/cipd/cipd", "describe", "private/package/linux-amd64", - "--version", + "-version", "40-chars-fake-of-the-package-instance_id", - "--json-output", + "-json-output", "/path/to/tmp/json", - "--service-account-json", + "-service-account-json", "fake-credentials.json" ], "name": "cipd describe private/package/linux-amd64", @@ -252,13 +252,13 @@ "cmd": [ "[START_DIR]/cipd/cipd", "pkg-build", - "--in", + "-in", "fake-input-dir", - "--name", + "-name", "infra/fake-package", - "--out", + "-out", "fake-package-path", - "--json-output", + "-json-output", "/path/to/tmp/json" ], "name": "build fake-package", @@ -276,15 +276,15 @@ "cmd": [ "[START_DIR]/cipd/cipd", "pkg-build", - "--in", + "-in", "fake-input-dir", - "--name", + "-name", "infra/fake-package", - "--out", + "-out", "fake-package-path", - "--json-output", + "-json-output", "/path/to/tmp/json", - "--install-mode", + "-install-mode", "copy" ], "name": "build fake-package (2)", @@ -303,17 +303,17 @@ "[START_DIR]/cipd/cipd", "pkg-register", "fake-package-path", - "--json-output", + "-json-output", "/path/to/tmp/json", - "--service-account-json", + "-service-account-json", "fake-credentials.json", - "--ref", + "-ref", "fake-ref-1", - "--ref", + "-ref", "fake-ref-2", - "--tag", + "-tag", "fake_tag_1:fake_value_1", - "--tag", + "-tag", "fake_tag_2:fake_value_2" ], "name": "register infra/fake-package", @@ -331,19 +331,19 @@ "cmd": [ "[START_DIR]/cipd/cipd", "create", - "--pkg-def", + "-pkg-def", "[START_DIR]/fake-package.yaml", - "--json-output", + "-json-output", "/path/to/tmp/json", - "--service-account-json", + "-service-account-json", "fake-credentials.json", - "--ref", + "-ref", "fake-ref-1", - "--ref", + "-ref", "fake-ref-2", - "--tag", + "-tag", "fake_tag_1:fake_value_1", - "--tag", + "-tag", "fake_tag_2:fake_value_2" ], "name": "create fake-package.yaml", @@ -357,15 +357,15 @@ "[START_DIR]/cipd/cipd", "set-tag", "fake-package", - "--version", + "-version", "long/weird/ref/which/doesn/not/fit/into/40chars", - "--json-output", + "-json-output", "/path/to/tmp/json", - "--service-account-json", + "-service-account-json", "fake-credentials.json", - "--tag", + "-tag", "dead:beaf", - "--tag", + "-tag", "more:value" ], "name": "cipd set-tag fake-package", @@ -387,15 +387,15 @@ "[START_DIR]/cipd/cipd", "set-ref", "fake-package", - "--version", + "-version", "latest", - "--json-output", + "-json-output", "/path/to/tmp/json", - "--service-account-json", + "-service-account-json", "fake-credentials.json", - "--ref", + "-ref", "any", - "--ref", + "-ref", "some" ], "name": "cipd set-ref fake-package", @@ -417,11 +417,11 @@ "[START_DIR]/cipd/cipd", "search", "fake-package/linux-amd64", - "--tag", + "-tag", "dead:beaf", - "--json-output", + "-json-output", "/path/to/tmp/json", - "--service-account-json", + "-service-account-json", "fake-credentials.json" ], "name": "cipd search fake-package/linux-amd64 dead:beaf", diff --git a/recipe_modules/cipd/example.expected/mac64.json b/recipe_modules/cipd/example.expected/mac64.json index e1fabde3f..000e4a102 100644 --- a/recipe_modules/cipd/example.expected/mac64.json +++ b/recipe_modules/cipd/example.expected/mac64.json @@ -49,13 +49,13 @@ "cmd": [ "[START_DIR]/cipd/cipd", "ensure", - "--root", + "-root", "[START_DIR]/packages", - "--list", + "-ensure-file", "public/package/mac-amd64 7f751b2237df2fdf3c1405be00590fefffbaea2d", - "--json-output", + "-json-output", "/path/to/tmp/json", - "--service-account-json", + "-service-account-json", "/creds/service_accounts/service-account-cipd-builder.json" ], "name": "ensure_installed", @@ -76,11 +76,11 @@ "[START_DIR]/cipd/cipd", "search", "public/package/mac-amd64", - "--tag", + "-tag", "git_revision:40-chars-long-hash", - "--json-output", + "-json-output", "/path/to/tmp/json", - "--service-account-json", + "-service-account-json", "/creds/service_accounts/service-account-cipd-builder.json" ], "name": "cipd search public/package/mac-amd64 git_revision:40-chars-long-hash", @@ -101,11 +101,11 @@ "[START_DIR]/cipd/cipd", "describe", "public/package/mac-amd64", - "--version", + "-version", "40-chars-fake-of-the-package-instance_id", - "--json-output", + "-json-output", "/path/to/tmp/json", - "--service-account-json", + "-service-account-json", "/creds/service_accounts/service-account-cipd-builder.json" ], "name": "cipd describe public/package/mac-amd64", @@ -151,13 +151,13 @@ "cmd": [ "[START_DIR]/cipd/cipd", "ensure", - "--root", + "-root", "[START_DIR]/packages", - "--list", + "-ensure-file", "private/package/mac-amd64 latest\npublic/package/mac-amd64 7f751b2237df2fdf3c1405be00590fefffbaea2d", - "--json-output", + "-json-output", "/path/to/tmp/json", - "--service-account-json", + "-service-account-json", "fake-credentials.json" ], "name": "ensure_installed (2)", @@ -182,11 +182,11 @@ "[START_DIR]/cipd/cipd", "search", "private/package/mac-amd64", - "--tag", + "-tag", "key:value", - "--json-output", + "-json-output", "/path/to/tmp/json", - "--service-account-json", + "-service-account-json", "fake-credentials.json" ], "name": "cipd search private/package/mac-amd64 key:value", @@ -207,11 +207,11 @@ "[START_DIR]/cipd/cipd", "describe", "private/package/mac-amd64", - "--version", + "-version", "40-chars-fake-of-the-package-instance_id", - "--json-output", + "-json-output", "/path/to/tmp/json", - "--service-account-json", + "-service-account-json", "fake-credentials.json" ], "name": "cipd describe private/package/mac-amd64", @@ -252,13 +252,13 @@ "cmd": [ "[START_DIR]/cipd/cipd", "pkg-build", - "--in", + "-in", "fake-input-dir", - "--name", + "-name", "infra/fake-package", - "--out", + "-out", "fake-package-path", - "--json-output", + "-json-output", "/path/to/tmp/json" ], "name": "build fake-package", @@ -276,15 +276,15 @@ "cmd": [ "[START_DIR]/cipd/cipd", "pkg-build", - "--in", + "-in", "fake-input-dir", - "--name", + "-name", "infra/fake-package", - "--out", + "-out", "fake-package-path", - "--json-output", + "-json-output", "/path/to/tmp/json", - "--install-mode", + "-install-mode", "copy" ], "name": "build fake-package (2)", @@ -303,17 +303,17 @@ "[START_DIR]/cipd/cipd", "pkg-register", "fake-package-path", - "--json-output", + "-json-output", "/path/to/tmp/json", - "--service-account-json", + "-service-account-json", "fake-credentials.json", - "--ref", + "-ref", "fake-ref-1", - "--ref", + "-ref", "fake-ref-2", - "--tag", + "-tag", "fake_tag_1:fake_value_1", - "--tag", + "-tag", "fake_tag_2:fake_value_2" ], "name": "register infra/fake-package", @@ -331,19 +331,19 @@ "cmd": [ "[START_DIR]/cipd/cipd", "create", - "--pkg-def", + "-pkg-def", "[START_DIR]/fake-package.yaml", - "--json-output", + "-json-output", "/path/to/tmp/json", - "--service-account-json", + "-service-account-json", "fake-credentials.json", - "--ref", + "-ref", "fake-ref-1", - "--ref", + "-ref", "fake-ref-2", - "--tag", + "-tag", "fake_tag_1:fake_value_1", - "--tag", + "-tag", "fake_tag_2:fake_value_2" ], "name": "create fake-package.yaml", @@ -357,15 +357,15 @@ "[START_DIR]/cipd/cipd", "set-tag", "fake-package", - "--version", + "-version", "long/weird/ref/which/doesn/not/fit/into/40chars", - "--json-output", + "-json-output", "/path/to/tmp/json", - "--service-account-json", + "-service-account-json", "fake-credentials.json", - "--tag", + "-tag", "dead:beaf", - "--tag", + "-tag", "more:value" ], "name": "cipd set-tag fake-package", @@ -387,15 +387,15 @@ "[START_DIR]/cipd/cipd", "set-ref", "fake-package", - "--version", + "-version", "latest", - "--json-output", + "-json-output", "/path/to/tmp/json", - "--service-account-json", + "-service-account-json", "fake-credentials.json", - "--ref", + "-ref", "any", - "--ref", + "-ref", "some" ], "name": "cipd set-ref fake-package", @@ -417,11 +417,11 @@ "[START_DIR]/cipd/cipd", "search", "fake-package/mac-amd64", - "--tag", + "-tag", "dead:beaf", - "--json-output", + "-json-output", "/path/to/tmp/json", - "--service-account-json", + "-service-account-json", "fake-credentials.json" ], "name": "cipd search fake-package/mac-amd64 dead:beaf", diff --git a/recipe_modules/cipd/example.expected/win64.json b/recipe_modules/cipd/example.expected/win64.json index 733dbaca1..e1fef45aa 100644 --- a/recipe_modules/cipd/example.expected/win64.json +++ b/recipe_modules/cipd/example.expected/win64.json @@ -49,13 +49,13 @@ "cmd": [ "[START_DIR]\\cipd\\cipd", "ensure", - "--root", + "-root", "[START_DIR]\\packages", - "--list", + "-ensure-file", "public/package/windows-amd64 7f751b2237df2fdf3c1405be00590fefffbaea2d", - "--json-output", + "-json-output", "/path/to/tmp/json", - "--service-account-json", + "-service-account-json", "C:\\creds\\service_accounts\\service-account-cipd-builder.json" ], "name": "ensure_installed", @@ -76,11 +76,11 @@ "[START_DIR]\\cipd\\cipd", "search", "public/package/windows-amd64", - "--tag", + "-tag", "git_revision:40-chars-long-hash", - "--json-output", + "-json-output", "/path/to/tmp/json", - "--service-account-json", + "-service-account-json", "C:\\creds\\service_accounts\\service-account-cipd-builder.json" ], "name": "cipd search public/package/windows-amd64 git_revision:40-chars-long-hash", @@ -101,11 +101,11 @@ "[START_DIR]\\cipd\\cipd", "describe", "public/package/windows-amd64", - "--version", + "-version", "40-chars-fake-of-the-package-instance_id", - "--json-output", + "-json-output", "/path/to/tmp/json", - "--service-account-json", + "-service-account-json", "C:\\creds\\service_accounts\\service-account-cipd-builder.json" ], "name": "cipd describe public/package/windows-amd64", @@ -151,13 +151,13 @@ "cmd": [ "[START_DIR]\\cipd\\cipd", "ensure", - "--root", + "-root", "[START_DIR]\\packages", - "--list", + "-ensure-file", "private/package/windows-amd64 latest\npublic/package/windows-amd64 7f751b2237df2fdf3c1405be00590fefffbaea2d", - "--json-output", + "-json-output", "/path/to/tmp/json", - "--service-account-json", + "-service-account-json", "fake-credentials.json" ], "name": "ensure_installed (2)", @@ -182,11 +182,11 @@ "[START_DIR]\\cipd\\cipd", "search", "private/package/windows-amd64", - "--tag", + "-tag", "key:value", - "--json-output", + "-json-output", "/path/to/tmp/json", - "--service-account-json", + "-service-account-json", "fake-credentials.json" ], "name": "cipd search private/package/windows-amd64 key:value", @@ -207,11 +207,11 @@ "[START_DIR]\\cipd\\cipd", "describe", "private/package/windows-amd64", - "--version", + "-version", "40-chars-fake-of-the-package-instance_id", - "--json-output", + "-json-output", "/path/to/tmp/json", - "--service-account-json", + "-service-account-json", "fake-credentials.json" ], "name": "cipd describe private/package/windows-amd64", @@ -252,13 +252,13 @@ "cmd": [ "[START_DIR]\\cipd\\cipd", "pkg-build", - "--in", + "-in", "fake-input-dir", - "--name", + "-name", "infra/fake-package", - "--out", + "-out", "fake-package-path", - "--json-output", + "-json-output", "/path/to/tmp/json" ], "name": "build fake-package", @@ -276,15 +276,15 @@ "cmd": [ "[START_DIR]\\cipd\\cipd", "pkg-build", - "--in", + "-in", "fake-input-dir", - "--name", + "-name", "infra/fake-package", - "--out", + "-out", "fake-package-path", - "--json-output", + "-json-output", "/path/to/tmp/json", - "--install-mode", + "-install-mode", "copy" ], "name": "build fake-package (2)", @@ -303,17 +303,17 @@ "[START_DIR]\\cipd\\cipd", "pkg-register", "fake-package-path", - "--json-output", + "-json-output", "/path/to/tmp/json", - "--service-account-json", + "-service-account-json", "fake-credentials.json", - "--ref", + "-ref", "fake-ref-1", - "--ref", + "-ref", "fake-ref-2", - "--tag", + "-tag", "fake_tag_1:fake_value_1", - "--tag", + "-tag", "fake_tag_2:fake_value_2" ], "name": "register infra/fake-package", @@ -331,19 +331,19 @@ "cmd": [ "[START_DIR]\\cipd\\cipd", "create", - "--pkg-def", + "-pkg-def", "[START_DIR]\\fake-package.yaml", - "--json-output", + "-json-output", "/path/to/tmp/json", - "--service-account-json", + "-service-account-json", "fake-credentials.json", - "--ref", + "-ref", "fake-ref-1", - "--ref", + "-ref", "fake-ref-2", - "--tag", + "-tag", "fake_tag_1:fake_value_1", - "--tag", + "-tag", "fake_tag_2:fake_value_2" ], "name": "create fake-package.yaml", @@ -357,15 +357,15 @@ "[START_DIR]\\cipd\\cipd", "set-tag", "fake-package", - "--version", + "-version", "long/weird/ref/which/doesn/not/fit/into/40chars", - "--json-output", + "-json-output", "/path/to/tmp/json", - "--service-account-json", + "-service-account-json", "fake-credentials.json", - "--tag", + "-tag", "dead:beaf", - "--tag", + "-tag", "more:value" ], "name": "cipd set-tag fake-package", @@ -387,15 +387,15 @@ "[START_DIR]\\cipd\\cipd", "set-ref", "fake-package", - "--version", + "-version", "latest", - "--json-output", + "-json-output", "/path/to/tmp/json", - "--service-account-json", + "-service-account-json", "fake-credentials.json", - "--ref", + "-ref", "any", - "--ref", + "-ref", "some" ], "name": "cipd set-ref fake-package", @@ -417,11 +417,11 @@ "[START_DIR]\\cipd\\cipd", "search", "fake-package/windows-amd64", - "--tag", + "-tag", "dead:beaf", - "--json-output", + "-json-output", "/path/to/tmp/json", - "--service-account-json", + "-service-account-json", "fake-credentials.json" ], "name": "cipd search fake-package/windows-amd64 dead:beaf", diff --git a/recipe_modules/cipd/resources/bootstrap.py b/recipe_modules/cipd/resources/bootstrap.py index 75df3eb7e..8e9af0adc 100644 --- a/recipe_modules/cipd/resources/bootstrap.py +++ b/recipe_modules/cipd/resources/bootstrap.py @@ -20,13 +20,13 @@ CIPD_BACKEND_URL = 'https://chrome-infra-packages.appspot.com' # ./cipd resolve \ # infra/tools/cipd/ \ -# -version=git_revision:768586a9aa72fe6a41a8a0205ed56ceb1495625c +# -version=git_revision:ac753ee37abd753a9a511210d3df362d003211f0 CLIENT_VERSIONS = { - 'linux-386': '3f5d6d3906c3b2c6a057d1ab1634ac06aa418708', - 'linux-amd64': '1ea0b6b254ad3f546c826dd3e437798ace2c2480', - 'mac-amd64': 'c111be343c692e5285113a6b1c999887adbb268e', - 'windows-386': 'dc3d1bd5b4b93945640bac4bb047c333a8fa12fd', - 'windows-amd64': 'bccdb9a605037e3dd2a8a64e79e08f691a6f159d', + 'linux-386':'486264612ec0ad488b5a4ee022892450797b52ac', + 'linux-amd64':'1be98ff08b61ce4a901cece0a227f4b5cfc12e9d', + 'mac-amd64':'6de26293b09ed68cc4b8f48f61f3a6265a1aca9c', + 'windows-386':'4dad98ea0f8e7af324532ee2571c14237e2fb76b', + 'windows-amd64':'96af3f67d017a6285d491471f39d3d983a2a7011', }