oci 2.5.6 → 2.5.7

Sign up to get free protection for your applications and to get access to all the features.
Files changed (60) hide show
  1. checksums.yaml +4 -4
  2. data/README.md +1 -1
  3. data/lib/oci/core/compute_client.rb +2 -2
  4. data/lib/oci/core/compute_client_composite_operations.rb +1 -1
  5. data/lib/oci/core/compute_management_client.rb +1 -1
  6. data/lib/oci/core/models/attach_load_balancer_details.rb +2 -2
  7. data/lib/oci/core/models/create_ip_sec_connection_details.rb +58 -3
  8. data/lib/oci/core/models/create_subnet_details.rb +12 -1
  9. data/lib/oci/core/models/detach_load_balancer_details.rb +2 -2
  10. data/lib/oci/core/models/fast_connect_provider_service.rb +5 -1
  11. data/lib/oci/core/models/fast_connect_provider_service_key.rb +4 -1
  12. data/lib/oci/core/models/instance_agent_config.rb +2 -0
  13. data/lib/oci/core/models/instance_pool.rb +3 -3
  14. data/lib/oci/core/models/instance_pool_instance_load_balancer_backend.rb +1 -1
  15. data/lib/oci/core/models/instance_pool_load_balancer_attachment.rb +3 -3
  16. data/lib/oci/core/models/instance_pool_summary.rb +1 -1
  17. data/lib/oci/core/models/instance_summary.rb +2 -2
  18. data/lib/oci/core/models/ip_sec_connection.rb +64 -3
  19. data/lib/oci/core/models/launch_instance_agent_config_details.rb +2 -0
  20. data/lib/oci/core/models/private_ip.rb +2 -1
  21. data/lib/oci/core/models/subnet.rb +2 -1
  22. data/lib/oci/core/models/update_instance_agent_config_details.rb +2 -0
  23. data/lib/oci/core/models/update_instance_pool_details.rb +1 -1
  24. data/lib/oci/core/models/update_ip_sec_connection_details.rb +74 -4
  25. data/lib/oci/core/models/volume_backup_schedule.rb +1 -1
  26. data/lib/oci/core/virtual_network_client.rb +7 -3
  27. data/lib/oci/database/database_client.rb +15 -14
  28. data/lib/oci/database/models/autonomous_data_warehouse.rb +1 -1
  29. data/lib/oci/database/models/autonomous_data_warehouse_backup.rb +1 -1
  30. data/lib/oci/database/models/autonomous_data_warehouse_backup_summary.rb +1 -2
  31. data/lib/oci/database/models/autonomous_data_warehouse_connection_strings.rb +1 -1
  32. data/lib/oci/database/models/autonomous_data_warehouse_summary.rb +1 -1
  33. data/lib/oci/database/models/autonomous_database.rb +20 -5
  34. data/lib/oci/database/models/autonomous_database_summary.rb +20 -5
  35. data/lib/oci/database/models/create_autonomous_data_warehouse_backup_details.rb +1 -1
  36. data/lib/oci/database/models/create_autonomous_data_warehouse_details.rb +1 -1
  37. data/lib/oci/database/models/create_autonomous_database_base.rb +1 -1
  38. data/lib/oci/database/models/db_node.rb +1 -1
  39. data/lib/oci/database/models/db_node_summary.rb +1 -1
  40. data/lib/oci/database/models/db_system.rb +1 -1
  41. data/lib/oci/database/models/db_system_summary.rb +1 -1
  42. data/lib/oci/database/models/generate_autonomous_data_warehouse_wallet_details.rb +1 -1
  43. data/lib/oci/database/models/generate_autonomous_database_wallet_details.rb +1 -1
  44. data/lib/oci/database/models/launch_db_system_base.rb +9 -9
  45. data/lib/oci/database/models/restore_autonomous_data_warehouse_details.rb +1 -1
  46. data/lib/oci/database/models/update_autonomous_data_warehouse_details.rb +1 -1
  47. data/lib/oci/database/models/update_autonomous_database_details.rb +48 -4
  48. data/lib/oci/identity/identity_client.rb +12 -12
  49. data/lib/oci/identity/identity_client_composite_operations.rb +4 -4
  50. data/lib/oci/identity/models/create_dynamic_group_details.rb +38 -4
  51. data/lib/oci/identity/models/create_tag_default_details.rb +3 -3
  52. data/lib/oci/identity/models/dynamic_group.rb +38 -4
  53. data/lib/oci/identity/models/tag_default.rb +15 -10
  54. data/lib/oci/identity/models/tag_default_summary.rb +8 -8
  55. data/lib/oci/identity/models/update_dynamic_group_details.rb +38 -4
  56. data/lib/oci/identity/models/update_tag_default_details.rb +1 -1
  57. data/lib/oci/identity/models/update_user_details.rb +1 -1
  58. data/lib/oci/identity/models/user.rb +2 -2
  59. data/lib/oci/version.rb +1 -1
  60. metadata +2 -2
@@ -24,6 +24,7 @@ module OCI
24
24
  LIFECYCLE_STATE_BACKUP_IN_PROGRESS = 'BACKUP_IN_PROGRESS'.freeze,
25
25
  LIFECYCLE_STATE_SCALE_IN_PROGRESS = 'SCALE_IN_PROGRESS'.freeze,
26
26
  LIFECYCLE_STATE_AVAILABLE_NEEDS_ATTENTION = 'AVAILABLE_NEEDS_ATTENTION'.freeze,
27
+ LIFECYCLE_STATE_UPDATING = 'UPDATING'.freeze,
27
28
  LIFECYCLE_STATE_UNKNOWN_ENUM_VALUE = 'UNKNOWN_ENUM_VALUE'.freeze
28
29
  ].freeze
29
30
 
@@ -112,10 +113,14 @@ module OCI
112
113
  # @return [String]
113
114
  attr_accessor :db_version
114
115
 
115
- # The Autonomous Database workload type.
116
+ # The Autonomous Database workload type. OLTP indicates an Autonomous Transaction Processing database and DW indicates an Autonomous Data Warehouse database.
116
117
  # @return [String]
117
118
  attr_reader :db_workload
118
119
 
120
+ # The client IP access control list (ACL). Only clients connecting from an IP address included in the ACL may access the Autonomous Database instance. This is an array of CIDR (Classless Inter-Domain Routing) notations for a subnet.
121
+ # @return [Array<String>]
122
+ attr_accessor :whitelisted_ips
123
+
119
124
  # Attribute mapping from ruby-style variable name to JSON key.
120
125
  def self.attribute_map
121
126
  {
@@ -136,7 +141,8 @@ module OCI
136
141
  'freeform_tags': :'freeformTags',
137
142
  'defined_tags': :'definedTags',
138
143
  'db_version': :'dbVersion',
139
- 'db_workload': :'dbWorkload'
144
+ 'db_workload': :'dbWorkload',
145
+ 'whitelisted_ips': :'whitelistedIps'
140
146
  # rubocop:enable Style/SymbolLiteral
141
147
  }
142
148
  end
@@ -161,7 +167,8 @@ module OCI
161
167
  'freeform_tags': :'Hash<String, String>',
162
168
  'defined_tags': :'Hash<String, Hash<String, Object>>',
163
169
  'db_version': :'String',
164
- 'db_workload': :'String'
170
+ 'db_workload': :'String',
171
+ 'whitelisted_ips': :'Array<String>'
165
172
  # rubocop:enable Style/SymbolLiteral
166
173
  }
167
174
  end
@@ -189,6 +196,7 @@ module OCI
189
196
  # @option attributes [Hash<String, Hash<String, Object>>] :defined_tags The value to assign to the {#defined_tags} property
190
197
  # @option attributes [String] :db_version The value to assign to the {#db_version} property
191
198
  # @option attributes [String] :db_workload The value to assign to the {#db_workload} property
199
+ # @option attributes [Array<String>] :whitelisted_ips The value to assign to the {#whitelisted_ips} property
192
200
  def initialize(attributes = {})
193
201
  return unless attributes.is_a?(Hash)
194
202
 
@@ -292,6 +300,12 @@ module OCI
292
300
  raise 'You cannot provide both :dbWorkload and :db_workload' if attributes.key?(:'dbWorkload') && attributes.key?(:'db_workload')
293
301
 
294
302
  self.db_workload = attributes[:'db_workload'] if attributes[:'db_workload']
303
+
304
+ self.whitelisted_ips = attributes[:'whitelistedIps'] if attributes[:'whitelistedIps']
305
+
306
+ raise 'You cannot provide both :whitelistedIps and :whitelisted_ips' if attributes.key?(:'whitelistedIps') && attributes.key?(:'whitelisted_ips')
307
+
308
+ self.whitelisted_ips = attributes[:'whitelisted_ips'] if attributes[:'whitelisted_ips']
295
309
  end
296
310
  # rubocop:enable Metrics/CyclomaticComplexity, Metrics/AbcSize, Metrics/PerceivedComplexity
297
311
  # rubocop:enable Metrics/LineLength, Metrics/MethodLength, Layout/EmptyLines, Style/SymbolLiteral
@@ -366,7 +380,8 @@ module OCI
366
380
  freeform_tags == other.freeform_tags &&
367
381
  defined_tags == other.defined_tags &&
368
382
  db_version == other.db_version &&
369
- db_workload == other.db_workload
383
+ db_workload == other.db_workload &&
384
+ whitelisted_ips == other.whitelisted_ips
370
385
  end
371
386
  # rubocop:enable Metrics/CyclomaticComplexity, Metrics/AbcSize, Metrics/PerceivedComplexity, Metrics/LineLength, Layout/EmptyLines
372
387
 
@@ -382,7 +397,7 @@ module OCI
382
397
  # Calculates hash code according to all attributes.
383
398
  # @return [Fixnum] Hash code
384
399
  def hash
385
- [id, compartment_id, lifecycle_state, lifecycle_details, db_name, cpu_core_count, data_storage_size_in_tbs, time_created, display_name, service_console_url, connection_strings, license_model, used_data_storage_size_in_tbs, freeform_tags, defined_tags, db_version, db_workload].hash
400
+ [id, compartment_id, lifecycle_state, lifecycle_details, db_name, cpu_core_count, data_storage_size_in_tbs, time_created, display_name, service_console_url, connection_strings, license_model, used_data_storage_size_in_tbs, freeform_tags, defined_tags, db_version, db_workload, whitelisted_ips].hash
386
401
  end
387
402
  # rubocop:enable Metrics/AbcSize, Metrics/LineLength, Layout/EmptyLines
388
403
 
@@ -4,7 +4,7 @@ require 'date'
4
4
 
5
5
  # rubocop:disable Lint/UnneededCopDisableDirective
6
6
  module OCI
7
- # Details to create an Oracle Autonomous Data Warehouse backup.
7
+ # **Deprecated.** See {#create_autonomous_database_backup_details create_autonomous_database_backup_details} for reference information about creating Autonomous Data Warehouse backups.
8
8
  #
9
9
  # **Warning:** Oracle recommends that you avoid using any confidential information when you supply string values using the API.
10
10
  #
@@ -4,7 +4,7 @@ require 'date'
4
4
 
5
5
  # rubocop:disable Lint/UnneededCopDisableDirective
6
6
  module OCI
7
- # Details to create an Oracle Autonomous Data Warehouse.
7
+ # **Deprecated.** See {#create_autonomous_database_details create_autonomous_database_details} for reference information about creating an Oracle Autonomous Data Warehouse.
8
8
  #
9
9
  # **Warning:** Oracle recommends that you avoid using any confidential information when you supply string values using the API.
10
10
  #
@@ -37,7 +37,7 @@ module OCI
37
37
  # @return [Integer]
38
38
  attr_accessor :cpu_core_count
39
39
 
40
- # The autonomous database workload type.
40
+ # The autonomous database workload type. OLTP indicates an Autonomous Transaction Processing database and DW indicates an Autonomous Data Warehouse. The default is OLTP.
41
41
  # @return [String]
42
42
  attr_reader :db_workload
43
43
 
@@ -44,7 +44,7 @@ module OCI
44
44
  # @return [String]
45
45
  attr_accessor :hostname
46
46
 
47
- # The name of the fault domain the instance is contained in.
47
+ # The name of the Fault Domain the instance is contained in.
48
48
  # @return [String]
49
49
  attr_accessor :fault_domain
50
50
 
@@ -49,7 +49,7 @@ module OCI
49
49
  # @return [String]
50
50
  attr_accessor :hostname
51
51
 
52
- # The name of the fault domain the instance is contained in.
52
+ # The name of the Fault Domain the instance is contained in.
53
53
  # @return [String]
54
54
  attr_accessor :fault_domain
55
55
 
@@ -56,7 +56,7 @@ module OCI
56
56
  # @return [String]
57
57
  attr_accessor :availability_domain
58
58
 
59
- # List of the fault domains in which this DB system is provisioned.
59
+ # List of the Fault Domains in which this DB system is provisioned.
60
60
  # @return [Array<String>]
61
61
  attr_accessor :fault_domains
62
62
 
@@ -70,7 +70,7 @@ module OCI
70
70
  # @return [String]
71
71
  attr_accessor :availability_domain
72
72
 
73
- # List of the fault domains in which this DB system is provisioned.
73
+ # List of the Fault Domains in which this DB system is provisioned.
74
74
  # @return [Array<String>]
75
75
  attr_accessor :fault_domains
76
76
 
@@ -4,7 +4,7 @@ require 'date'
4
4
 
5
5
  # rubocop:disable Lint/UnneededCopDisableDirective
6
6
  module OCI
7
- # Details to create and download a wallet for an Oracle Autonomous Data Warehouse.
7
+ # **Deprecated.** See {#generate_autonomous_database_wallet_details generate_autonomous_database_wallet_details} for reference information about creating and downloading a wallet for an Oracle Autonomous Data Warehouse.
8
8
  #
9
9
  class Database::Models::GenerateAutonomousDataWarehouseWalletDetails # rubocop:disable Metrics/LineLength
10
10
  # **[Required]** The password to encrypt the keys inside the wallet. The password must be at least 8 characters long and must include at least 1 letter and either 1 numeric character or 1 special character.
@@ -4,7 +4,7 @@ require 'date'
4
4
 
5
5
  # rubocop:disable Lint/UnneededCopDisableDirective
6
6
  module OCI
7
- # Details to create and download an Oracle Autonomous Transaction Processing database wallet.
7
+ # Details to create and download an Oracle Autonomous Database wallet.
8
8
  #
9
9
  class Database::Models::GenerateAutonomousDatabaseWalletDetails # rubocop:disable Metrics/LineLength
10
10
  # **[Required]** The password to encrypt the keys inside the wallet. The password must be at least 8 characters long and must include at least 1 letter and either 1 numeric character or 1 special character.
@@ -19,19 +19,19 @@ module OCI
19
19
  # @return [String]
20
20
  attr_accessor :compartment_id
21
21
 
22
- # A fault domain is a grouping of hardware and infrastructure within an availability domain.
23
- # Fault domains let you distribute your instances so that they are not on the same physical
22
+ # A Fault Domain is a grouping of hardware and infrastructure within an availability domain.
23
+ # Fault Domains let you distribute your instances so that they are not on the same physical
24
24
  # hardware within a single availability domain. A hardware failure or maintenance
25
- # that affects one fault domain does not affect DB systems in other fault domains.
25
+ # that affects one Fault Domain does not affect DB systems in other Fault Domains.
26
26
  #
27
- # If you do not specify the fault domain, the system selects one for you. To change the fault
28
- # domain for a DB system, terminate it and launch a new DB system in the preferred fault domain.
27
+ # If you do not specify the Fault Domain, the system selects one for you. To change the Fault
28
+ # Domain for a DB system, terminate it and launch a new DB system in the preferred Fault Domain.
29
29
  #
30
- # If the node count is greater than 1, you can specify which fault domains these nodes will be distributed into.
31
- # The system assigns your nodes automatically to the fault domains you specify so that
32
- # no fault domain contains more than one node.
30
+ # If the node count is greater than 1, you can specify which Fault Domains these nodes will be distributed into.
31
+ # The system assigns your nodes automatically to the Fault Domains you specify so that
32
+ # no Fault Domain contains more than one node.
33
33
  #
34
- # To get a list of fault domains, use the
34
+ # To get a list of Fault Domains, use the
35
35
  # {#list_fault_domains list_fault_domains} operation in the
36
36
  # Identity and Access Management Service API.
37
37
  #
@@ -4,7 +4,7 @@ require 'date'
4
4
 
5
5
  # rubocop:disable Lint/UnneededCopDisableDirective
6
6
  module OCI
7
- # Details to restore an Oracle Autonomous Data Warehouse.
7
+ # **Deprecated.** See {#restore_autonomous_database_details restore_autonomous_database_details} for reference information about restoring an Autonomous Data Warehouse.
8
8
  #
9
9
  class Database::Models::RestoreAutonomousDataWarehouseDetails # rubocop:disable Metrics/LineLength
10
10
  # **[Required]** The time to restore the database to.
@@ -4,7 +4,7 @@ require 'date'
4
4
 
5
5
  # rubocop:disable Lint/UnneededCopDisableDirective
6
6
  module OCI
7
- # Details to update an Oracle Autonomous Data Warehouse.
7
+ # **Deprecated.** See {#update_autonomous_database_details update_autonomous_database_details} for reference information about updating an Autonomous Data Warehouse.
8
8
  #
9
9
  # **Warning:** Oracle recommends that you avoid using any confidential information when you supply string values using the API.
10
10
  #
@@ -9,6 +9,11 @@ module OCI
9
9
  # **Warning:** Oracle recommends that you avoid using any confidential information when you supply string values using the API.
10
10
  #
11
11
  class Database::Models::UpdateAutonomousDatabaseDetails # rubocop:disable Metrics/LineLength
12
+ LICENSE_MODEL_ENUM = [
13
+ LICENSE_MODEL_LICENSE_INCLUDED = 'LICENSE_INCLUDED'.freeze,
14
+ LICENSE_MODEL_BRING_YOUR_OWN_LICENSE = 'BRING_YOUR_OWN_LICENSE'.freeze
15
+ ].freeze
16
+
12
17
  # The number of CPU cores to be made available to the database.
13
18
  # @return [Integer]
14
19
  attr_accessor :cpu_core_count
@@ -42,6 +47,15 @@ module OCI
42
47
  # @return [Hash<String, Hash<String, Object>>]
43
48
  attr_accessor :defined_tags
44
49
 
50
+ # The new Oracle license model that applies to the Oracle Autonomous Transaction Processing database.
51
+ #
52
+ # @return [String]
53
+ attr_reader :license_model
54
+
55
+ # The client IP access control list (ACL). Only clients connecting from an IP address included in the ACL may access the Autonomous Database instance. This is an array of CIDR (Classless Inter-Domain Routing) notations for a subnet. To delete all the existing white listed IP\u2019s, use an array with a single empty string entry.
56
+ # @return [Array<String>]
57
+ attr_accessor :whitelisted_ips
58
+
45
59
  # Attribute mapping from ruby-style variable name to JSON key.
46
60
  def self.attribute_map
47
61
  {
@@ -51,7 +65,9 @@ module OCI
51
65
  'display_name': :'displayName',
52
66
  'admin_password': :'adminPassword',
53
67
  'freeform_tags': :'freeformTags',
54
- 'defined_tags': :'definedTags'
68
+ 'defined_tags': :'definedTags',
69
+ 'license_model': :'licenseModel',
70
+ 'whitelisted_ips': :'whitelistedIps'
55
71
  # rubocop:enable Style/SymbolLiteral
56
72
  }
57
73
  end
@@ -65,7 +81,9 @@ module OCI
65
81
  'display_name': :'String',
66
82
  'admin_password': :'String',
67
83
  'freeform_tags': :'Hash<String, String>',
68
- 'defined_tags': :'Hash<String, Hash<String, Object>>'
84
+ 'defined_tags': :'Hash<String, Hash<String, Object>>',
85
+ 'license_model': :'String',
86
+ 'whitelisted_ips': :'Array<String>'
69
87
  # rubocop:enable Style/SymbolLiteral
70
88
  }
71
89
  end
@@ -82,6 +100,8 @@ module OCI
82
100
  # @option attributes [String] :admin_password The value to assign to the {#admin_password} property
83
101
  # @option attributes [Hash<String, String>] :freeform_tags The value to assign to the {#freeform_tags} property
84
102
  # @option attributes [Hash<String, Hash<String, Object>>] :defined_tags The value to assign to the {#defined_tags} property
103
+ # @option attributes [String] :license_model The value to assign to the {#license_model} property
104
+ # @option attributes [Array<String>] :whitelisted_ips The value to assign to the {#whitelisted_ips} property
85
105
  def initialize(attributes = {})
86
106
  return unless attributes.is_a?(Hash)
87
107
 
@@ -123,10 +143,32 @@ module OCI
123
143
  raise 'You cannot provide both :definedTags and :defined_tags' if attributes.key?(:'definedTags') && attributes.key?(:'defined_tags')
124
144
 
125
145
  self.defined_tags = attributes[:'defined_tags'] if attributes[:'defined_tags']
146
+
147
+ self.license_model = attributes[:'licenseModel'] if attributes[:'licenseModel']
148
+
149
+ raise 'You cannot provide both :licenseModel and :license_model' if attributes.key?(:'licenseModel') && attributes.key?(:'license_model')
150
+
151
+ self.license_model = attributes[:'license_model'] if attributes[:'license_model']
152
+
153
+ self.whitelisted_ips = attributes[:'whitelistedIps'] if attributes[:'whitelistedIps']
154
+
155
+ raise 'You cannot provide both :whitelistedIps and :whitelisted_ips' if attributes.key?(:'whitelistedIps') && attributes.key?(:'whitelisted_ips')
156
+
157
+ self.whitelisted_ips = attributes[:'whitelisted_ips'] if attributes[:'whitelisted_ips']
126
158
  end
127
159
  # rubocop:enable Metrics/CyclomaticComplexity, Metrics/AbcSize, Metrics/PerceivedComplexity
128
160
  # rubocop:enable Metrics/LineLength, Metrics/MethodLength, Layout/EmptyLines, Style/SymbolLiteral
129
161
 
162
+ # Custom attribute writer method checking allowed values (enum).
163
+ # @param [Object] license_model Object to be assigned
164
+ def license_model=(license_model)
165
+ # rubocop: disable Metrics/LineLength
166
+ raise "Invalid value for 'license_model': this must be one of the values in LICENSE_MODEL_ENUM." if license_model && !LICENSE_MODEL_ENUM.include?(license_model)
167
+
168
+ # rubocop: enable Metrics/LineLength
169
+ @license_model = license_model
170
+ end
171
+
130
172
  # rubocop:disable Metrics/CyclomaticComplexity, Metrics/AbcSize, Metrics/PerceivedComplexity, Metrics/LineLength, Layout/EmptyLines
131
173
 
132
174
 
@@ -141,7 +183,9 @@ module OCI
141
183
  display_name == other.display_name &&
142
184
  admin_password == other.admin_password &&
143
185
  freeform_tags == other.freeform_tags &&
144
- defined_tags == other.defined_tags
186
+ defined_tags == other.defined_tags &&
187
+ license_model == other.license_model &&
188
+ whitelisted_ips == other.whitelisted_ips
145
189
  end
146
190
  # rubocop:enable Metrics/CyclomaticComplexity, Metrics/AbcSize, Metrics/PerceivedComplexity, Metrics/LineLength, Layout/EmptyLines
147
191
 
@@ -157,7 +201,7 @@ module OCI
157
201
  # Calculates hash code according to all attributes.
158
202
  # @return [Fixnum] Hash code
159
203
  def hash
160
- [cpu_core_count, data_storage_size_in_tbs, display_name, admin_password, freeform_tags, defined_tags].hash
204
+ [cpu_core_count, data_storage_size_in_tbs, display_name, admin_password, freeform_tags, defined_tags, license_model, whitelisted_ips].hash
161
205
  end
162
206
  # rubocop:enable Metrics/AbcSize, Metrics/LineLength, Layout/EmptyLines
163
207
 
@@ -536,7 +536,7 @@ module OCI
536
536
  # [Resource Identifiers](https://docs.cloud.oracle.com/Content/General/Concepts/identifiers.htm).
537
537
  #
538
538
  # You must also specify a *name* for the dynamic group, which must be unique across all dynamic groups in your
539
- # tenancy, and cannot be changed. Note that this name has to be also unique accross all groups in your tenancy.
539
+ # tenancy, and cannot be changed. Note that this name has to be also unique across all groups in your tenancy.
540
540
  # You can use this name or the OCID when writing policies that apply to the dynamic group. For more information
541
541
  # about policies, see [How Policies Work](https://docs.cloud.oracle.com/Content/Identity/Concepts/policies.htm).
542
542
  #
@@ -1300,9 +1300,9 @@ module OCI
1300
1300
  # rubocop:disable Metrics/MethodLength, Layout/EmptyLines
1301
1301
 
1302
1302
 
1303
- # Creates a new Tag Default in the specified Compartment for the specified Tag Definition.
1303
+ # Creates a new tag default in the specified compartment for the specified tag definition.
1304
1304
  #
1305
- # @param [OCI::Identity::Models::CreateTagDefaultDetails] create_tag_default_details Request object for creating a new Tag Default.
1305
+ # @param [OCI::Identity::Models::CreateTagDefaultDetails] create_tag_default_details Request object for creating a new tag default.
1306
1306
  # @param [Hash] opts the optional parameters
1307
1307
  # @option opts [OCI::Retry::RetryConfig] :retry_config The retry configuration to apply to this operation. If no key is provided then the service-level
1308
1308
  # retry configuration defined by {#retry_config} will be used. If an explicit `nil` value is provided then the operation will not retry
@@ -2230,9 +2230,9 @@ module OCI
2230
2230
  # rubocop:disable Metrics/MethodLength, Layout/EmptyLines
2231
2231
 
2232
2232
 
2233
- # Deletes the the specified Tag Default.
2233
+ # Deletes the the specified tag default.
2234
2234
  #
2235
- # @param [String] tag_default_id The OCID of the Tag Default.
2235
+ # @param [String] tag_default_id The OCID of the tag default.
2236
2236
  # @param [Hash] opts the optional parameters
2237
2237
  # @option opts [OCI::Retry::RetryConfig] :retry_config The retry configuration to apply to this operation. If no key is provided then the service-level
2238
2238
  # retry configuration defined by {#retry_config} will be used. If an explicit `nil` value is provided then the operation will not retry
@@ -2911,9 +2911,9 @@ module OCI
2911
2911
  # rubocop:disable Lint/UnusedMethodArgument
2912
2912
 
2913
2913
 
2914
- # Retrieves the specified Tag Default.
2914
+ # Retrieves the specified tag default.
2915
2915
  #
2916
- # @param [String] tag_default_id The OCID of the Tag Default.
2916
+ # @param [String] tag_default_id The OCID of the tag default.
2917
2917
  # @param [Hash] opts the optional parameters
2918
2918
  # @option opts [OCI::Retry::RetryConfig] :retry_config The retry configuration to apply to this operation. If no key is provided then the service-level
2919
2919
  # retry configuration defined by {#retry_config} will be used. If an explicit `nil` value is provided then the operation will not retry
@@ -4344,7 +4344,7 @@ module OCI
4344
4344
  # rubocop:disable Metrics/MethodLength, Layout/EmptyLines
4345
4345
 
4346
4346
 
4347
- # Lists the Tag Defaults for Tag Definitions in the specified Compartment.
4347
+ # Lists the tag defaults for tag definitions in the specified compartment.
4348
4348
  #
4349
4349
  # @param [Hash] opts the optional parameters
4350
4350
  # @option opts [OCI::Retry::RetryConfig] :retry_config The retry configuration to apply to this operation. If no key is provided then the service-level
@@ -4357,7 +4357,7 @@ module OCI
4357
4357
  #
4358
4358
  # @option opts [String] :compartment_id The OCID of the compartment (remember that the tenancy is simply the root compartment).
4359
4359
  #
4360
- # @option opts [String] :tag_definition_id The OCID of the Tag Definition.
4360
+ # @option opts [String] :tag_definition_id The OCID of the tag definition.
4361
4361
  #
4362
4362
  # @option opts [String] :lifecycle_state A filter to only return resources that match the given lifecycle state. The state value is case-insensitive.
4363
4363
  #
@@ -5570,10 +5570,10 @@ module OCI
5570
5570
  # rubocop:disable Metrics/MethodLength, Layout/EmptyLines
5571
5571
 
5572
5572
 
5573
- # Updates the the specified Tag Default. You can presently update the following fields: `value`.
5573
+ # Updates the the specified tag default. You can update the following field: `value`.
5574
5574
  #
5575
- # @param [String] tag_default_id The OCID of the Tag Default.
5576
- # @param [OCI::Identity::Models::UpdateTagDefaultDetails] update_tag_default_details Request object for updating a Tag Default.
5575
+ # @param [String] tag_default_id The OCID of the tag default.
5576
+ # @param [OCI::Identity::Models::UpdateTagDefaultDetails] update_tag_default_details Request object for updating a tag default.
5577
5577
  # @param [Hash] opts the optional parameters
5578
5578
  # @option opts [OCI::Retry::RetryConfig] :retry_config The retry configuration to apply to this operation. If no key is provided then the service-level
5579
5579
  # retry configuration defined by {#retry_config} will be used. If an explicit `nil` value is provided then the operation will not retry
@@ -340,7 +340,7 @@ module OCI
340
340
  # Calls {OCI::Identity::IdentityClient#create_tag_default} and then waits for the {OCI::Identity::Models::TagDefault} acted upon
341
341
  # to enter the given state(s).
342
342
  #
343
- # @param [OCI::Identity::Models::CreateTagDefaultDetails] create_tag_default_details Request object for creating a new Tag Default.
343
+ # @param [OCI::Identity::Models::CreateTagDefaultDetails] create_tag_default_details Request object for creating a new tag default.
344
344
  # @param [Array<String>] wait_for_states An array of states to wait on. These should be valid values for {OCI::Identity::Models::TagDefault#lifecycle_state}
345
345
  # @param [Hash] base_operation_opts Any optional arguments accepted by {OCI::Identity::IdentityClient#create_tag_default}
346
346
  # @param [Hash] waiter_opts Optional arguments for the waiter. Keys should be symbols, and the following keys are supported:
@@ -627,7 +627,7 @@ module OCI
627
627
  # Calls {OCI::Identity::IdentityClient#delete_tag_default} and then waits for the {OCI::Identity::Models::TagDefault} acted upon
628
628
  # to enter the given state(s).
629
629
  #
630
- # @param [String] tag_default_id The OCID of the Tag Default.
630
+ # @param [String] tag_default_id The OCID of the tag default.
631
631
  # @param [Array<String>] wait_for_states An array of states to wait on. These should be valid values for {OCI::Identity::Models::TagDefault#lifecycle_state}
632
632
  # @param [Hash] base_operation_opts Any optional arguments accepted by {OCI::Identity::IdentityClient#delete_tag_default}
633
633
  # @param [Hash] waiter_opts Optional arguments for the waiter. Keys should be symbols, and the following keys are supported:
@@ -988,8 +988,8 @@ module OCI
988
988
  # Calls {OCI::Identity::IdentityClient#update_tag_default} and then waits for the {OCI::Identity::Models::TagDefault} acted upon
989
989
  # to enter the given state(s).
990
990
  #
991
- # @param [String] tag_default_id The OCID of the Tag Default.
992
- # @param [OCI::Identity::Models::UpdateTagDefaultDetails] update_tag_default_details Request object for updating a Tag Default.
991
+ # @param [String] tag_default_id The OCID of the tag default.
992
+ # @param [OCI::Identity::Models::UpdateTagDefaultDetails] update_tag_default_details Request object for updating a tag default.
993
993
  # @param [Array<String>] wait_for_states An array of states to wait on. These should be valid values for {OCI::Identity::Models::TagDefault#lifecycle_state}
994
994
  # @param [Hash] base_operation_opts Any optional arguments accepted by {OCI::Identity::IdentityClient#update_tag_default}
995
995
  # @param [Hash] waiter_opts Optional arguments for the waiter. Keys should be symbols, and the following keys are supported:
@@ -26,6 +26,20 @@ module OCI
26
26
  # @return [String]
27
27
  attr_accessor :description
28
28
 
29
+ # Free-form tags for this resource. Each tag is a simple key-value pair with no predefined name, type, or namespace.
30
+ # For more information, see [Resource Tags](https://docs.cloud.oracle.com/Content/General/Concepts/resourcetags.htm).
31
+ # Example: `{\"Department\": \"Finance\"}`
32
+ #
33
+ # @return [Hash<String, String>]
34
+ attr_accessor :freeform_tags
35
+
36
+ # Defined tags for this resource. Each key is predefined and scoped to a namespace.
37
+ # For more information, see [Resource Tags](https://docs.cloud.oracle.com/Content/General/Concepts/resourcetags.htm).
38
+ # Example: `{\"Operations\": {\"CostCenter\": \"42\"}}`
39
+ #
40
+ # @return [Hash<String, Hash<String, Object>>]
41
+ attr_accessor :defined_tags
42
+
29
43
  # Attribute mapping from ruby-style variable name to JSON key.
30
44
  def self.attribute_map
31
45
  {
@@ -33,7 +47,9 @@ module OCI
33
47
  'compartment_id': :'compartmentId',
34
48
  'name': :'name',
35
49
  'matching_rule': :'matchingRule',
36
- 'description': :'description'
50
+ 'description': :'description',
51
+ 'freeform_tags': :'freeformTags',
52
+ 'defined_tags': :'definedTags'
37
53
  # rubocop:enable Style/SymbolLiteral
38
54
  }
39
55
  end
@@ -45,7 +61,9 @@ module OCI
45
61
  'compartment_id': :'String',
46
62
  'name': :'String',
47
63
  'matching_rule': :'String',
48
- 'description': :'String'
64
+ 'description': :'String',
65
+ 'freeform_tags': :'Hash<String, String>',
66
+ 'defined_tags': :'Hash<String, Hash<String, Object>>'
49
67
  # rubocop:enable Style/SymbolLiteral
50
68
  }
51
69
  end
@@ -60,6 +78,8 @@ module OCI
60
78
  # @option attributes [String] :name The value to assign to the {#name} property
61
79
  # @option attributes [String] :matching_rule The value to assign to the {#matching_rule} property
62
80
  # @option attributes [String] :description The value to assign to the {#description} property
81
+ # @option attributes [Hash<String, String>] :freeform_tags The value to assign to the {#freeform_tags} property
82
+ # @option attributes [Hash<String, Hash<String, Object>>] :defined_tags The value to assign to the {#defined_tags} property
63
83
  def initialize(attributes = {})
64
84
  return unless attributes.is_a?(Hash)
65
85
 
@@ -81,6 +101,18 @@ module OCI
81
101
  self.matching_rule = attributes[:'matching_rule'] if attributes[:'matching_rule']
82
102
 
83
103
  self.description = attributes[:'description'] if attributes[:'description']
104
+
105
+ self.freeform_tags = attributes[:'freeformTags'] if attributes[:'freeformTags']
106
+
107
+ raise 'You cannot provide both :freeformTags and :freeform_tags' if attributes.key?(:'freeformTags') && attributes.key?(:'freeform_tags')
108
+
109
+ self.freeform_tags = attributes[:'freeform_tags'] if attributes[:'freeform_tags']
110
+
111
+ self.defined_tags = attributes[:'definedTags'] if attributes[:'definedTags']
112
+
113
+ raise 'You cannot provide both :definedTags and :defined_tags' if attributes.key?(:'definedTags') && attributes.key?(:'defined_tags')
114
+
115
+ self.defined_tags = attributes[:'defined_tags'] if attributes[:'defined_tags']
84
116
  end
85
117
  # rubocop:enable Metrics/CyclomaticComplexity, Metrics/AbcSize, Metrics/PerceivedComplexity
86
118
  # rubocop:enable Metrics/LineLength, Metrics/MethodLength, Layout/EmptyLines, Style/SymbolLiteral
@@ -97,7 +129,9 @@ module OCI
97
129
  compartment_id == other.compartment_id &&
98
130
  name == other.name &&
99
131
  matching_rule == other.matching_rule &&
100
- description == other.description
132
+ description == other.description &&
133
+ freeform_tags == other.freeform_tags &&
134
+ defined_tags == other.defined_tags
101
135
  end
102
136
  # rubocop:enable Metrics/CyclomaticComplexity, Metrics/AbcSize, Metrics/PerceivedComplexity, Metrics/LineLength, Layout/EmptyLines
103
137
 
@@ -113,7 +147,7 @@ module OCI
113
147
  # Calculates hash code according to all attributes.
114
148
  # @return [Fixnum] Hash code
115
149
  def hash
116
- [compartment_id, name, matching_rule, description].hash
150
+ [compartment_id, name, matching_rule, description, freeform_tags, defined_tags].hash
117
151
  end
118
152
  # rubocop:enable Metrics/AbcSize, Metrics/LineLength, Layout/EmptyLines
119
153