choria-mcorpc-support 2.26.2 → 2.26.3

Sign up to get free protection for your applications and to get access to all the features.
Files changed (17) hide show
  1. checksums.yaml +4 -4
  2. data/lib/mcollective/agent/aaa_signer.ddl +5 -1
  3. data/lib/mcollective/agent/aaa_signer.json +1 -1
  4. data/lib/mcollective/agent/choria_provision.ddl +9 -1
  5. data/lib/mcollective/agent/choria_provision.json +1 -1
  6. data/lib/mcollective/agent/choria_registry.ddl +5 -1
  7. data/lib/mcollective/agent/choria_registry.json +1 -1
  8. data/lib/mcollective/agent/choria_util.ddl +5 -1
  9. data/lib/mcollective/agent/choria_util.json +1 -1
  10. data/lib/mcollective/agent/rpcutil.ddl +5 -1
  11. data/lib/mcollective/agent/rpcutil.json +1 -1
  12. data/lib/mcollective/agent/scout.ddl +5 -1
  13. data/lib/mcollective/agent/scout.json +1 -1
  14. data/lib/mcollective/pluginpackager/forge_packager.rb +1 -1
  15. data/lib/mcollective/shell.rb +0 -1
  16. data/lib/mcollective/util/choria.rb +3 -2
  17. metadata +3 -3
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: b2a92d73331d1dfabcfc35d7b12450ec5ad3026289fd0d9afd6d744b17cfed22
4
- data.tar.gz: fbb5b974bed1c123d7ac730b5836cc033b15ad8e6ec79d6a20634a91bc304b3e
3
+ metadata.gz: 3afcdee832e60d663bb3b6191631a315dfa017297620227c73fec431acaec163
4
+ data.tar.gz: a643991b5feb3f8f19ab71c3ff66a4cef89dd1f0c1208882ef12fcddeec037d5
5
5
  SHA512:
6
- metadata.gz: 85c8e1bafacbc2ca481332dc4879acecdef151cb0cdb8c1eb8f14173298b288b4d4a2d9c7f2eed08719868b80ef5a23c4e50e903b07c9e776cd604c00b548c1a
7
- data.tar.gz: dc8cd959eb42bf830eea2e938ba06552280bde4f4b8c47bfd75f61053d53e9616ed1a7ac1458d586eb5d5ac88b2d03a4d29dc1bb2dcd59839c938513d65e7af0
6
+ metadata.gz: d85ba1e2515ef6282ac3c2d62c0612987d187f1539a30533c6c5da5389c60fd61aec7be8741934ecb3fcf717f681817e1cf606c9e8d38ec7a8699ea6a2a81dbc
7
+ data.tar.gz: cba939b5c47ead81430299df123f4e779cda4c1116e36ebef2e25bb420e21c761818a6045f8d97447b5b3fc82201edbf45ef72a2ef471b2b6f6344084f751421
data/lib/mcollective/agent/aaa_signer.ddl CHANGED
@@ -1,8 +1,12 @@
1
+ -- Copyright (c) 2024, R.I. Pienaar and the Choria Project contributors
2
+ --
3
+ -- SPDX-License-Identifier: Apache-2.0
4
+
1
5
  metadata :name => "aaa_signer",
2
6
  :description => "Request Signer for Choria AAA Service",
3
7
  :author => "R.I.Pienaar <rip@devco.net>",
4
8
  :license => "Apache-2.0",
5
- :version => "0.27.0",
9
+ :version => "0.28.0",
6
10
  :url => "https://github.com/choria-io/aaasvc",
7
11
  :provider => "golang",
8
12
  :service => true,
data/lib/mcollective/agent/aaa_signer.json CHANGED
@@ -5,7 +5,7 @@
5
5
  "author": "R.I.Pienaar \u003crip@devco.net\u003e",
6
6
  "timeout": 10,
7
7
  "name": "aaa_signer",
8
- "version": "0.27.0",
8
+ "version": "0.28.0",
9
9
  "url": "https://github.com/choria-io/aaasvc",
10
10
  "description": "Request Signer for Choria AAA Service",
11
11
  "provider": "golang",
data/lib/mcollective/agent/choria_provision.ddl CHANGED
@@ -1,8 +1,16 @@
1
+ -- Copyright (c) 2024, R.I. Pienaar and the Choria Project contributors
2
+ --
3
+ -- SPDX-License-Identifier: Apache-2.0
4
+
5
+ -- Copyright (c) 2024, R.I. Pienaar and the Choria Project contributors
6
+ --
7
+ -- SPDX-License-Identifier: Apache-2.0
8
+
1
9
  metadata :name => "choria_provision",
2
10
  :description => "Choria Provisioner",
3
11
  :author => "R.I.Pienaar <rip@devco.net>",
4
12
  :license => "Apache-2.0",
5
- :version => "0.27.0",
13
+ :version => "0.28.0",
6
14
  :url => "https://choria.io",
7
15
  :timeout => 20
8
16
 
data/lib/mcollective/agent/choria_provision.json CHANGED
@@ -5,7 +5,7 @@
5
5
  "description": "Choria Provisioner",
6
6
  "author": "R.I.Pienaar <rip@devco.net>",
7
7
  "license": "Apache-2.0",
8
- "version": "0.27.0",
8
+ "version": "0.28.0",
9
9
  "url": "https://choria.io",
10
10
  "timeout": 20
11
11
  },
data/lib/mcollective/agent/choria_registry.ddl CHANGED
@@ -1,8 +1,12 @@
1
+ -- Copyright (c) 2024, R.I. Pienaar and the Choria Project contributors
2
+ --
3
+ -- SPDX-License-Identifier: Apache-2.0
4
+
1
5
  metadata :name => "choria_registry",
2
6
  :description => "Choria Registry Service",
3
7
  :author => "rip@devco.net <rip@devco.net>",
4
8
  :license => "Apache-2.0",
5
- :version => "0.27.0",
9
+ :version => "0.28.0",
6
10
  :url => "https://choria.io",
7
11
  :provider => "golang",
8
12
  :service => true,
data/lib/mcollective/agent/choria_registry.json CHANGED
@@ -5,7 +5,7 @@
5
5
  "author": "rip@devco.net \u003crip@devco.net\u003e",
6
6
  "timeout": 2,
7
7
  "name": "choria_registry",
8
- "version": "0.27.0",
8
+ "version": "0.28.0",
9
9
  "url": "https://choria.io",
10
10
  "description": "Choria Registry Service",
11
11
  "provider": "golang",
data/lib/mcollective/agent/choria_util.ddl CHANGED
@@ -1,8 +1,12 @@
1
+ -- Copyright (c) 2024, R.I. Pienaar and the Choria Project contributors
2
+ --
3
+ -- SPDX-License-Identifier: Apache-2.0
4
+
1
5
  metadata :name => "choria_util",
2
6
  :description => "Choria Utilities",
3
7
  :author => "R.I.Pienaar <rip@devco.net>",
4
8
  :license => "Apache-2.0",
5
- :version => "0.27.0",
9
+ :version => "0.28.0",
6
10
  :url => "https://choria.io",
7
11
  :timeout => 2
8
12
 
data/lib/mcollective/agent/choria_util.json CHANGED
@@ -5,7 +5,7 @@
5
5
  "description": "Choria Utilities",
6
6
  "author": "R.I.Pienaar <rip@devco.net>",
7
7
  "license": "Apache-2.0",
8
- "version": "0.27.0",
8
+ "version": "0.28.0",
9
9
  "url": "https://choria.io",
10
10
  "timeout": 2
11
11
  },
data/lib/mcollective/agent/rpcutil.ddl CHANGED
@@ -1,8 +1,12 @@
1
+ -- Copyright (c) 2024, R.I. Pienaar and the Choria Project contributors
2
+ --
3
+ -- SPDX-License-Identifier: Apache-2.0
4
+
1
5
  metadata :name => "rpcutil",
2
6
  :description => "Utility actions that expose information about the state of the running Server",
3
7
  :author => "R.I.Pienaar <rip@devco.net>",
4
8
  :license => "Apache-2.0",
5
- :version => "0.27.0",
9
+ :version => "0.28.0",
6
10
  :url => "https://choria.io/",
7
11
  :timeout => 2
8
12
 
data/lib/mcollective/agent/rpcutil.json CHANGED
@@ -5,7 +5,7 @@
5
5
  "description": "Utility actions that expose information about the state of the running Server",
6
6
  "author": "R.I.Pienaar <rip@devco.net>",
7
7
  "license": "Apache-2.0",
8
- "version": "0.27.0",
8
+ "version": "0.28.0",
9
9
  "url": "https://choria.io/",
10
10
  "timeout": 2
11
11
  },
data/lib/mcollective/agent/scout.ddl CHANGED
@@ -1,8 +1,12 @@
1
+ -- Copyright (c) 2024, R.I. Pienaar and the Choria Project contributors
2
+ --
3
+ -- SPDX-License-Identifier: Apache-2.0
4
+
1
5
  metadata :name => "scout",
2
6
  :description => "Choria Scout Agent Management API",
3
7
  :author => "R.I.Pienaar <rip@devco.net>",
4
8
  :license => "Apache-2.0",
5
- :version => "0.27.0",
9
+ :version => "0.28.0",
6
10
  :url => "https://choria.io",
7
11
  :provider => "golang",
8
12
  :timeout => 5
data/lib/mcollective/agent/scout.json CHANGED
@@ -5,7 +5,7 @@
5
5
  "author": "R.I.Pienaar <rip@devco.net>",
6
6
  "timeout": 5,
7
7
  "name": "scout",
8
- "version": "0.27.0",
8
+ "version": "0.28.0",
9
9
  "url": "https://choria.io",
10
10
  "description": "Choria Scout Agent Management API",
11
11
  "provider": "golang"
data/lib/mcollective/pluginpackager/forge_packager.rb CHANGED
@@ -191,7 +191,7 @@ module MCollective
191
191
  end
192
192
 
193
193
  def render_template(infile, outfile)
194
- erb = ERB.new(File.read(infile), 0, "-")
194
+ erb = ERB.new(File.read(infile), :safe_level => 0, :trim_mode => "-")
195
195
  File.open(outfile, "w") do |f|
196
196
  f.puts erb.result(binding)
197
197
  end
data/lib/mcollective/shell.rb CHANGED
@@ -121,7 +121,6 @@ module MCollective
121
121
  Log.info("Unexpected exception received while waiting for child process: #{e.class}: #{e}")
122
122
  end
123
123
  end
124
- @status.thread.kill
125
124
  @status
126
125
  end
127
126
  end
data/lib/mcollective/util/choria.rb CHANGED
@@ -127,12 +127,13 @@ module MCollective
127
127
 
128
128
  # Determines the domain to do SRV lookups in
129
129
  #
130
- # This is settable using choria.srv_domain and defaults
130
+ # This is settable using the environment variable
131
+ # CHORIA_SRV_DOMAIN or choria.srv_domain and defaults
131
132
  # to the domain as reported by facter
132
133
  #
133
134
  # @return [String]
134
135
  def srv_domain
135
- get_option("choria.srv_domain", nil) || facter_domain
136
+ env_fetch("CHORIA_SRV_DOMAIN", nil) || get_option("choria.srv_domain", nil) || facter_domain
136
137
  end
137
138
 
138
139
  # Determines the SRV records to look up
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: choria-mcorpc-support
3
3
  version: !ruby/object:Gem::Version
4
- version: 2.26.2
4
+ version: 2.26.3
5
5
  platform: ruby
6
6
  authors:
7
7
  - R.I.Pienaar
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2023-03-22 00:00:00.000000000 Z
11
+ date: 2024-02-03 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: systemu
@@ -247,7 +247,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
247
247
  version: '0'
248
248
  requirements: []
249
249
  rubyforge_project:
250
- rubygems_version: 2.7.6.3
250
+ rubygems_version: 2.7.6.2
251
251
  signing_key:
252
252
  specification_version: 4
253
253
  summary: Support libraries the Choria Server