gapic-generator-cloud 0.8.0 → 0.9.0
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/CHANGELOG.md +4 -0
- data/lib/gapic/generator/cloud/version.rb +1 -1
- data/lib/gapic/generators/cloud_generator_parameters.rb +2 -0
- data/lib/gapic/presenters/cloud_gem_presenter.rb +7 -1
- data/lib/gapic/presenters/wrapper_gem_presenter.rb +11 -2
- data/templates/cloud/gem/authentication.erb +9 -7
- data/templates/cloud/gem/rakefile.erb +7 -7
- data/templates/cloud/gem/readme.erb +3 -3
- data/templates/cloud/service/client/_credentials.erb +4 -0
- data/templates/cloud/wrapper_gem/rakefile.erb +7 -7
- metadata +4 -4
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA256:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: 417ab2b02d4393ee7aa32224d20f1b8d6bf9408bd9c3e54bb834e98de4e66f5d
|
4
|
+
data.tar.gz: b5059c5c751d1c0b2628879a8c91503fa2a468c75e5df5224d361657dca7956c
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 7948811d0ae712c0020828aa4609db23891c7d99d1c5f84c6e5c956f2b432920d49c75c790824014e49318a026bf90a70e5ad5fe667cad89902e1b0387e3be29
|
7
|
+
data.tar.gz: 00a19859f19ae6688ec50aacd1bd0991fbfec3f2e59858c4513e73ed35d911db4a649ad36a9bf021599d20130f1b9f006e4d0a4c085f33586dcd84827c676c8a
|
data/CHANGELOG.md
CHANGED
@@ -42,6 +42,8 @@ module Gapic
|
|
42
42
|
"ruby-cloud-api-id" => ":gem.:api_id",
|
43
43
|
"ruby-cloud-api-shortname" => ":gem.:api_shortname",
|
44
44
|
"ruby-cloud-factory-method-suffix" => ":gem.:factory_method_suffix",
|
45
|
+
"ruby-cloud-quick-start-service" => ":gem.:quick_start_service",
|
46
|
+
"ruby-cloud-quick-start-method" => ":gem.:quick_start_method",
|
45
47
|
"ruby-cloud-default-service-host" => ":defaults.:service.:default_host",
|
46
48
|
"ruby-cloud-grpc-service-config" => "grpc_service_config",
|
47
49
|
"ruby-cloud-wrapper-gem-override" => ":overrides.:wrapper_gem_name"
|
@@ -77,6 +77,10 @@ module Gapic
|
|
77
77
|
desc
|
78
78
|
end
|
79
79
|
|
80
|
+
def cloud_env_prefix
|
81
|
+
env_prefix || "GOOGLE_CLOUD"
|
82
|
+
end
|
83
|
+
|
80
84
|
##
|
81
85
|
# Returns a hash of extra generator arguments to be rendered into the
|
82
86
|
# repo-metadata.json file.
|
@@ -84,12 +88,14 @@ module Gapic
|
|
84
88
|
def generator_args_for_metadata
|
85
89
|
result = {}
|
86
90
|
result["ruby-cloud-description"] = description
|
87
|
-
result["ruby-cloud-env-prefix"] = env_prefix
|
91
|
+
result["ruby-cloud-env-prefix"] = env_prefix if env_prefix
|
88
92
|
result["ruby-cloud-product-url"] = product_documentation_url if product_documentation_url
|
89
93
|
path_overrides = @api.overrides_of(:file_path).map { |k, v| "#{k}=#{v}" }.join ";"
|
90
94
|
result["ruby-cloud-path-override"] = path_overrides unless path_overrides.empty?
|
91
95
|
namespace_overrides = @api.overrides_of(:namespace).map { |k, v| "#{k}=#{v}" }.join ";"
|
92
96
|
result["ruby-cloud-namespace-override"] = namespace_overrides unless namespace_overrides.empty?
|
97
|
+
service_overrides = @api.overrides_of(:service).map { |k, v| "#{k}=#{v}" }.join ";"
|
98
|
+
result["ruby-cloud-service-override"] = service_overrides unless service_overrides.empty?
|
93
99
|
result
|
94
100
|
end
|
95
101
|
end
|
@@ -107,9 +107,18 @@ module Gapic
|
|
107
107
|
|
108
108
|
def dependencies
|
109
109
|
@dependencies ||= begin
|
110
|
-
deps = { "google-cloud-core" => "~> 1.
|
110
|
+
deps = { "google-cloud-core" => "~> 1.6" }
|
111
111
|
version_dependencies.each do |version, requirement|
|
112
|
-
|
112
|
+
# For pre-release dependencies on versioned clients, support both
|
113
|
+
# 0.x and 1.x versions to ease the transition to 1.0 (GA) releases
|
114
|
+
# for those dependencies. (Note the 0.x->1.0 transition is
|
115
|
+
# generally not breaking.)
|
116
|
+
deps["#{name}-#{version}"] =
|
117
|
+
if requirement.start_with? "0."
|
118
|
+
[">= #{requirement}", "< 2.a"]
|
119
|
+
else
|
120
|
+
"~> #{requirement}"
|
121
|
+
end
|
113
122
|
end
|
114
123
|
extra_deps = gem_config_dependencies
|
115
124
|
deps.merge! extra_deps if extra_deps
|
@@ -22,7 +22,7 @@ during development.
|
|
22
22
|
2. Set the [environment variable](#environment-variables).
|
23
23
|
|
24
24
|
```sh
|
25
|
-
export <%= gem.
|
25
|
+
export <%= gem.cloud_env_prefix %>_CREDENTIALS=path/to/keyfile.json
|
26
26
|
```
|
27
27
|
|
28
28
|
3. Initialize the client.
|
@@ -69,16 +69,18 @@ The environment variables that <%= gem.name %>
|
|
69
69
|
checks for credentials are configured on the service Credentials class (such as
|
70
70
|
<%= service.credentials_class_xref %>):
|
71
71
|
|
72
|
-
|
73
|
-
|
74
|
-
|
75
|
-
|
76
|
-
|
72
|
+
<%- if gem.env_prefix -%>
|
73
|
+
* `<%= gem.env_prefix %>_CREDENTIALS` - Path to JSON file, or JSON contents
|
74
|
+
* `<%= gem.env_prefix %>_KEYFILE` - Path to JSON file, or JSON contents
|
75
|
+
<%- end -%>
|
76
|
+
* `GOOGLE_CLOUD_CREDENTIALS` - Path to JSON file, or JSON contents
|
77
|
+
* `GOOGLE_CLOUD_KEYFILE` - Path to JSON file, or JSON contents
|
78
|
+
* `GOOGLE_APPLICATION_CREDENTIALS` - Path to JSON file
|
77
79
|
|
78
80
|
```ruby
|
79
81
|
require "<%= gem.entrypoint_require %>"
|
80
82
|
|
81
|
-
ENV["<%= gem.
|
83
|
+
ENV["<%= gem.cloud_env_prefix %>_CREDENTIALS"] = "path/to/keyfile.json"
|
82
84
|
|
83
85
|
client = <%= service.create_client_call %>
|
84
86
|
```
|
@@ -56,29 +56,29 @@ task :acceptance, :project, :keyfile do |t, args|
|
|
56
56
|
<%- if service && !gem.generic_endpoint? -%>
|
57
57
|
project = args[:project]
|
58
58
|
project ||=
|
59
|
-
ENV["<%= gem.
|
59
|
+
ENV["<%= gem.cloud_env_prefix %>_TEST_PROJECT"] ||
|
60
60
|
ENV["GCLOUD_TEST_PROJECT"]
|
61
61
|
keyfile = args[:keyfile]
|
62
62
|
keyfile ||=
|
63
|
-
ENV["<%= gem.
|
63
|
+
ENV["<%= gem.cloud_env_prefix %>_TEST_KEYFILE"] ||
|
64
64
|
ENV["GCLOUD_TEST_KEYFILE"]
|
65
65
|
if keyfile
|
66
66
|
keyfile = File.read keyfile
|
67
67
|
else
|
68
68
|
keyfile ||=
|
69
|
-
ENV["<%= gem.
|
69
|
+
ENV["<%= gem.cloud_env_prefix %>_TEST_KEYFILE_JSON"] ||
|
70
70
|
ENV["GCLOUD_TEST_KEYFILE_JSON"]
|
71
71
|
end
|
72
72
|
if project.nil? || keyfile.nil?
|
73
|
-
fail "You must provide a project and keyfile. e.g. rake acceptance[test123, /path/to/keyfile.json] or <%= gem.
|
73
|
+
fail "You must provide a project and keyfile. e.g. rake acceptance[test123, /path/to/keyfile.json] or <%= gem.cloud_env_prefix %>_TEST_PROJECT=test123 <%= gem.cloud_env_prefix %>_TEST_KEYFILE=/path/to/keyfile.json rake acceptance"
|
74
74
|
end
|
75
75
|
require "<%= service.credentials_require %>"
|
76
76
|
<%= service.credentials_name_full %>.env_vars.each do |path|
|
77
77
|
ENV[path] = nil
|
78
78
|
end
|
79
|
-
ENV["<%= gem.
|
80
|
-
ENV["<%= gem.
|
81
|
-
ENV["<%= gem.
|
79
|
+
ENV["<%= gem.cloud_env_prefix %>_PROJECT"] = project
|
80
|
+
ENV["<%= gem.cloud_env_prefix %>_TEST_PROJECT"] = project
|
81
|
+
ENV["<%= gem.cloud_env_prefix %>_KEYFILE_JSON"] = keyfile
|
82
82
|
|
83
83
|
<%- end -%>
|
84
84
|
Rake::Task["acceptance:run"].invoke
|
@@ -44,12 +44,12 @@ In order to use this library, you first need to go through the following steps:
|
|
44
44
|
<%- if gem.packages? -%>
|
45
45
|
```ruby
|
46
46
|
require "<%= gem.entrypoint_require %>"
|
47
|
-
<%- service = gem.
|
48
|
-
<%- method = service&.
|
47
|
+
<%- service = gem.quick_start_service -%>
|
48
|
+
<%- method = service&.quick_start_method -%>
|
49
49
|
<%- if service && method -%>
|
50
50
|
|
51
51
|
client = <%= service.create_client_call %>
|
52
|
-
request =
|
52
|
+
request = <%= method.request_type %>.new # (request fields as keyword arguments...)
|
53
53
|
response = client.<%= method.name %> request
|
54
54
|
<%- end -%>
|
55
55
|
```
|
@@ -13,13 +13,17 @@ class <%= service.credentials_name %> < ::Google::Auth::Credentials
|
|
13
13
|
]
|
14
14
|
<%- end -%>
|
15
15
|
self.env_vars = [
|
16
|
+
<%- if service.gem.env_prefix -%>
|
16
17
|
"<%= service.gem.env_prefix %>_CREDENTIALS",
|
17
18
|
"<%= service.gem.env_prefix %>_KEYFILE",
|
19
|
+
<%- end -%>
|
18
20
|
"GOOGLE_CLOUD_CREDENTIALS",
|
19
21
|
"GOOGLE_CLOUD_KEYFILE",
|
20
22
|
"GCLOUD_KEYFILE",
|
23
|
+
<%- if service.gem.env_prefix -%>
|
21
24
|
"<%= service.gem.env_prefix %>_CREDENTIALS_JSON",
|
22
25
|
"<%= service.gem.env_prefix %>_KEYFILE_JSON",
|
26
|
+
<%- end -%>
|
23
27
|
"GOOGLE_CLOUD_CREDENTIALS_JSON",
|
24
28
|
"GOOGLE_CLOUD_KEYFILE_JSON",
|
25
29
|
"GCLOUD_KEYFILE_JSON"
|
@@ -56,29 +56,29 @@ desc "Run the <%= gem.name %> acceptance tests."
|
|
56
56
|
task :acceptance, :project, :keyfile do |t, args|
|
57
57
|
project = args[:project]
|
58
58
|
project ||=
|
59
|
-
ENV["<%= gem.
|
59
|
+
ENV["<%= gem.cloud_env_prefix %>_TEST_PROJECT"] ||
|
60
60
|
ENV["GCLOUD_TEST_PROJECT"]
|
61
61
|
keyfile = args[:keyfile]
|
62
62
|
keyfile ||=
|
63
|
-
ENV["<%= gem.
|
63
|
+
ENV["<%= gem.cloud_env_prefix %>_TEST_KEYFILE"] ||
|
64
64
|
ENV["GCLOUD_TEST_KEYFILE"]
|
65
65
|
if keyfile
|
66
66
|
keyfile = File.read keyfile
|
67
67
|
else
|
68
68
|
keyfile ||=
|
69
|
-
ENV["<%= gem.
|
69
|
+
ENV["<%= gem.cloud_env_prefix %>_TEST_KEYFILE_JSON"] ||
|
70
70
|
ENV["GCLOUD_TEST_KEYFILE_JSON"]
|
71
71
|
end
|
72
72
|
if project.nil? || keyfile.nil?
|
73
|
-
fail "You must provide a project and keyfile. e.g. rake acceptance[test123, /path/to/keyfile.json] or <%= gem.
|
73
|
+
fail "You must provide a project and keyfile. e.g. rake acceptance[test123, /path/to/keyfile.json] or <%= gem.cloud_env_prefix %>_TEST_PROJECT=test123 <%= gem.cloud_env_prefix %>_TEST_KEYFILE=/path/to/keyfile.json rake acceptance"
|
74
74
|
end
|
75
75
|
require "<%= service.credentials_require %>"
|
76
76
|
<%= service.credentials_name_full %>.env_vars.each do |path|
|
77
77
|
ENV[path] = nil
|
78
78
|
end
|
79
|
-
ENV["<%= gem.
|
80
|
-
ENV["<%= gem.
|
81
|
-
ENV["<%= gem.
|
79
|
+
ENV["<%= gem.cloud_env_prefix %>_PROJECT"] = project
|
80
|
+
ENV["<%= gem.cloud_env_prefix %>_TEST_PROJECT"] = project
|
81
|
+
ENV["<%= gem.cloud_env_prefix %>_KEYFILE_JSON"] = keyfile
|
82
82
|
|
83
83
|
Rake::Task["acceptance:run"].invoke
|
84
84
|
end
|
metadata
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: gapic-generator-cloud
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 0.
|
4
|
+
version: 0.9.0
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- Ernest Landrito
|
@@ -10,7 +10,7 @@ authors:
|
|
10
10
|
autorequire:
|
11
11
|
bindir: bin
|
12
12
|
cert_chain: []
|
13
|
-
date: 2021-06-
|
13
|
+
date: 2021-06-30 00:00:00.000000000 Z
|
14
14
|
dependencies:
|
15
15
|
- !ruby/object:Gem::Dependency
|
16
16
|
name: actionpack
|
@@ -32,14 +32,14 @@ dependencies:
|
|
32
32
|
requirements:
|
33
33
|
- - '='
|
34
34
|
- !ruby/object:Gem::Version
|
35
|
-
version: 0.
|
35
|
+
version: 0.9.0
|
36
36
|
type: :runtime
|
37
37
|
prerelease: false
|
38
38
|
version_requirements: !ruby/object:Gem::Requirement
|
39
39
|
requirements:
|
40
40
|
- - '='
|
41
41
|
- !ruby/object:Gem::Version
|
42
|
-
version: 0.
|
42
|
+
version: 0.9.0
|
43
43
|
- !ruby/object:Gem::Dependency
|
44
44
|
name: google-style
|
45
45
|
requirement: !ruby/object:Gem::Requirement
|