uffizzi_core 0.1.8 → 0.1.9

Sign up to get free protection for your applications and to get access to all the features.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 6c41a6d9264646c853ed0636d7855602ee530a1d8feaa412e47b89c0e3a90a4b
4
- data.tar.gz: aa67d7c9ba86f5fd0e8b07b85106ad877e14585e999193ba1c308455c8a76aa3
3
+ metadata.gz: 9532e97850641367e43300e96a1bfa963fc7ff60eb338b8422108b7e05f86340
4
+ data.tar.gz: 9cb98221b5762c2f16a6b6b1115eb0cd0ac63d9dd7fa9787591b0c28ed6546b5
5
5
  SHA512:
6
- metadata.gz: d398069220fd51c2ee9e5a797491b0a75058b1698330a7e9fb097f19b45795ad860a9008ea540f9c96535df6b005415ea766d2032aa9d749dda33c47a4904e7f
7
- data.tar.gz: 4b6566f15e749351219f155cbebbf3e78caf3b43a52ca2f01e44bfb81391115d27f232484890ea4852d881fdc9c94f4d7cfb2ed27e4366ad18651c232f018d5e
6
+ metadata.gz: 95975b5880598ab0c1763b7fdc667495bccaa845342f35a337210947ba8d6f2e11fee6117c0b9c96bdfee5541c9410374285d8e2c21501f2d9faf76cc06cf431
7
+ data.tar.gz: 312e608b26126ebbc52ce964bedc2f961fd87a9e5d528935f9f6a65c621cac4c8cddb4ed6a914616e28432428660bb602d5cf241ac236cd10801dca71232ac03
@@ -12,8 +12,6 @@ class UffizziCore::Controller::CreateCredential::CredentialSerializer < UffizziC
12
12
  def password
13
13
  if object.amazon?
14
14
  UffizziCore::Amazon::CredentialService.access_token(object)
15
- elsif object.github_container_registry?
16
- UffizziCore::GithubContainerRegistry::CredentialService.access_token(object, instance_options[:image])
17
15
  else
18
16
  object.password
19
17
  end
@@ -20,16 +20,17 @@ class UffizziCore::Controller::DeployContainers::ContainerSerializer < UffizziCo
20
20
  has_many :container_config_files
21
21
 
22
22
  def image
23
- credential = UffizziCore::RepoService.credential(object.repo)
23
+ repo = object.repo
24
+ credential = UffizziCore::RepoService.credential(repo)
24
25
 
25
- case object.repo.type
26
+ case repo.type
26
27
  when UffizziCore::Repo::Google.name, UffizziCore::Repo::Amazon.name, UffizziCore::Repo::Azure.name
27
28
  registry_host = URI.parse(credential.registry_url).host
28
29
 
29
30
  "#{registry_host}/#{object.image}"
30
31
  when UffizziCore::Repo::GithubContainerRegistry.name
31
32
  registry_host = URI.parse(credential.registry_url).host
32
- "#{registry_host}/#{credential.username}/#{object.image}"
33
+ "#{registry_host}/#{repo.namespace}/#{object.image}"
33
34
  else
34
35
  object.image
35
36
  end
@@ -37,7 +38,7 @@ class UffizziCore::Controller::DeployContainers::ContainerSerializer < UffizziCo
37
38
 
38
39
  def tag
39
40
  case object.repo.type
40
- when UffizziCore::Repo::Github.name, UffizziCore::Repo::GithubContainerRegistry.name
41
+ when UffizziCore::Repo::Github.name
41
42
  UffizziCore::RepoService.tag(object.repo)
42
43
  else
43
44
  object.tag
@@ -39,8 +39,10 @@ class UffizziCore::ComposeFile::IngressOptionsService
39
39
 
40
40
  raise UffizziCore::ComposeFile::ParseError, I18n.t('compose.invalid_integer', option: :port) unless port.is_a?(Integer)
41
41
 
42
- if port < Settings.compose.port_min_value || port > Settings.compose.port_max_value
43
- raise UffizziCore::ComposeFile::ParseError, I18n.t('compose.invalid_port')
42
+ port_min = Settings.compose.port_min_value
43
+ port_max = Settings.compose.port_max_value
44
+ if port < port_min || port > port_max
45
+ raise UffizziCore::ComposeFile::ParseError, I18n.t('compose.port_out_of_range', port_min: port_min, port_max: port_max)
44
46
  end
45
47
 
46
48
  port
@@ -25,7 +25,7 @@ en:
25
25
  invalid_ingress_service: Invalid ingress service '%{value}'
26
26
  no_variable_name: Invalid environment variable 'name=%{name}' 'value=%{value}'
27
27
  invalid_config: Invalid config value 'source=%{source}' 'target=%{target}'
28
- invalid_port: Invalid port specification '%{value}'
28
+ port_out_of_range: Port should be specified between %{port_min} - %{port_max}
29
29
  invalid_memory_postfix: The specified value for memory '%{value}' should specify the units. The postfix should be one of the `b` `k` `m` `g` characters
30
30
  invalid_memory_type: Memory '%{value}' contains an invalid type, it should be a string
31
31
  invalid_memory_value: Invalid memory value '%{value}'
@@ -1,5 +1,5 @@
1
1
  # frozen_string_literal: true
2
2
 
3
3
  module UffizziCore
4
- VERSION = '0.1.8'
4
+ VERSION = '0.1.9'
5
5
  end
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: uffizzi_core
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.1.8
4
+ version: 0.1.9
5
5
  platform: ruby
6
6
  authors:
7
7
  - Josh Thurman
@@ -451,6 +451,20 @@ dependencies:
451
451
  - - "~>"
452
452
  - !ruby/object:Gem::Version
453
453
  version: 3.1.7
454
+ - !ruby/object:Gem::Dependency
455
+ name: bump
456
+ requirement: !ruby/object:Gem::Requirement
457
+ requirements:
458
+ - - ">="
459
+ - !ruby/object:Gem::Version
460
+ version: '0'
461
+ type: :development
462
+ prerelease: false
463
+ version_requirements: !ruby/object:Gem::Requirement
464
+ requirements:
465
+ - - ">="
466
+ - !ruby/object:Gem::Version
467
+ version: '0'
454
468
  - !ruby/object:Gem::Dependency
455
469
  name: bundler
456
470
  requirement: !ruby/object:Gem::Requirement