aws-sdk-opsworkscm 1.1.0 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ba49c26509d96214e97f7b13f5b4da9528b66e79
-  data.tar.gz: 1f651db68b6250afdc0c8b091383f118045b4e98
+  metadata.gz: 59bbf13fe7697d53409a9766f069fbdcfb4b3628
+  data.tar.gz: cb03246aef009bd607ba2522006d3cb030806665
 SHA512:
-  metadata.gz: 313600120e5468ac8de32be7c967bb53d23cce8b85b3d95c1420f6324738c43e3ceec4b7598cb3234220b6708d5fcebde8e8a79c62ce53279d547f40995cf5c2
-  data.tar.gz: 9d4d0a495103783303130be2919fa098cd8a40da2a9a87b2195ba29acaaa8bae8508076ac4e8d125fc6e93c5f2d299703464129d0c078ca23713c1dc284a93c1
+  metadata.gz: 1274e1ea556a54907deaddec18224340bbc868fbf8f78753204ca3824ff7ada90fe007f50e0c52c17bd7a203076137ebf786c3f8f8bb9c77609ae27297481e28
+  data.tar.gz: 789374ed7f3686d649cb6dba7649623265768b72ec3a5f3b7b09284005c0d7d4bbed3dded635e9c49224c9a27c80c6812d3c90a69984c388dbd9bdb0e4f28b34

data/lib/aws-sdk-opsworkscm.rb

@@ -12,6 +12,7 @@ require_relative 'aws-sdk-opsworkscm/types'
 require_relative 'aws-sdk-opsworkscm/client_api'
 require_relative 'aws-sdk-opsworkscm/client'
 require_relative 'aws-sdk-opsworkscm/errors'
+require_relative 'aws-sdk-opsworkscm/waiters'
 require_relative 'aws-sdk-opsworkscm/resource'
 require_relative 'aws-sdk-opsworkscm/customizations'
 
@@ -42,6 +43,6 @@ require_relative 'aws-sdk-opsworkscm/customizations'
 # @service
 module Aws::OpsWorksCM
 
-  GEM_VERSION = '1.1.0'
+  GEM_VERSION = '1.2.0'
 
 end

data/lib/aws-sdk-opsworkscm/client.rb

@@ -155,9 +155,22 @@ module Aws::OpsWorksCM
 
     # @!group API Operations
 
-    # Associates a new node with the Chef server. This command is an
-    # alternative to `knife bootstrap`. For more information about how to
-    # disassociate a node, see DisassociateNode.
+    # Associates a new node with the server. For more information about how
+    # to disassociate a node, see DisassociateNode.
+    #
+    # On a Chef server: This command is an alternative to `knife bootstrap`.
+    #
+    # Example (Chef): `aws opsworks-cm associate-node --server-name MyServer
+    # --node-name MyManagedNode --engine-attributes
+    # "Name=CHEF_ORGANIZATION,Value=default"
+    # "Name=CHEF_NODE_PUBLIC_KEY,Value=public-key-pem"`
+    #
+    # On a Puppet server, this command is an alternative to the `puppet cert
+    # sign` command that signs a Puppet node CSR.
+    #
+    # Example (Chef): `aws opsworks-cm associate-node --server-name MyServer
+    # --node-name MyManagedNode --engine-attributes
+    # "Name=PUPPET_NODE_CSR,Value=csr-pem"`
     #
     # A node can can only be associated with servers that are in a `HEALTHY`
     # state. Otherwise, an `InvalidStateException` is thrown. A
@@ -167,21 +180,16 @@ module Aws::OpsWorksCM
     # Scaling configurations, AWS Cloudformation templates, or the user data
     # of a server's instance.
     #
-    # Example: `aws opsworks-cm associate-node --server-name MyServer
-    # --node-name MyManagedNode --engine-attributes
-    # "Name=MyOrganization,Value=default"
-    # "Name=Chef_node_public_key,Value=Public_key_contents"`
-    #
     # @option params [required, String] :server_name
     #   The name of the server with which to associate the node.
     #
     # @option params [required, String] :node_name
-    #   The name of the Chef client node.
+    #   The name of the node.
     #
     # @option params [required, Array<Types::EngineAttribute>] :engine_attributes
     #   Engine attributes used for associating the node.
     #
-    #   **Attributes accepted in a AssociateNode request:**
+    #   **Attributes accepted in a AssociateNode request for Chef**
     #
     #   * `CHEF_ORGANIZATION`\: The Chef organization with which the node is
     #     associated. By default only one organization named `default` can
@@ -190,6 +198,13 @@ module Aws::OpsWorksCM
     #   * `CHEF_NODE_PUBLIC_KEY`\: A PEM-formatted public key. This key is
     #     required for the `chef-client` agent to access the Chef API.
     #
+    #   **Attributes accepted in a AssociateNode request for Puppet**
+    #
+    #   * `PUPPET_NODE_CSR`\: A PEM-formatted certificate-signing request
+    #     (CSR) that is created by the node.
+    #
+    #   ^
+    #
     # @return [Types::AssociateNodeResponse] Returns a {Seahorse::Client::Response response} object which responds to the following methods:
     #
     #   * {Types::AssociateNodeResponse#node_association_status_token #node_association_status_token} => String
@@ -308,11 +323,18 @@ module Aws::OpsWorksCM
     #
     # If you do not specify a security group by adding the
     # `SecurityGroupIds` parameter, AWS OpsWorks creates a new security
-    # group. The default security group opens the Chef server to the world
-    # on TCP port 443. If a KeyName is present, AWS OpsWorks enables SSH
-    # access. SSH is also open to the world on TCP port 22.
+    # group.
+    #
+    # *Chef Automate:* The default security group opens the Chef server to
+    # the world on TCP port 443. If a KeyName is present, AWS OpsWorks
+    # enables SSH access. SSH is also open to the world on TCP port 22.
+    #
+    # *Puppet Enterprise:* The default security group opens TCP ports 22,
+    # 443, 4433, 8140, 8142, 8143, and 8170. If a KeyName is present, AWS
+    # OpsWorks enables SSH access. SSH is also open to the world on TCP port
+    # 22.
     #
-    # By default, the Chef Server is accessible from any IP address. We
+    # By default, your server is accessible from any IP address. We
     # recommend that you update your security group rules to allow access
     # from known IP addresses and address ranges only. To edit security
     # group rules, open Security Groups in the navigation pane of the EC2
@@ -328,24 +350,26 @@ module Aws::OpsWorksCM
     #
     # @option params [String] :engine
     #   The configuration management engine to use. Valid values include
-    #   `Chef`.
+    #   `Chef` and `Puppet`.
     #
     # @option params [String] :engine_model
-    #   The engine model, or option. Valid values include `Single`.
+    #   The engine model of the server. Valid values in this release include
+    #   `Monolithic` for Puppet and `Single` for Chef.
     #
     # @option params [String] :engine_version
-    #   The major release version of the engine that you want to use. Values
-    #   depend on the engine that you choose.
+    #   The major release version of the engine that you want to use. For a
+    #   Chef server, the valid value for EngineVersion is currently `12`. For
+    #   a Puppet server, the valid value is `2017`.
     #
     # @option params [Array<Types::EngineAttribute>] :engine_attributes
     #   Optional engine attributes on a specified server.
     #
-    #   **Attributes accepted in a createServer request:**
+    #   **Attributes accepted in a Chef createServer request:**
     #
     #   * `CHEF_PIVOTAL_KEY`\: A base64-encoded RSA private key that is not
-    #     stored by AWS OpsWorks for Chef. This private key is required to
-    #     access the Chef API. When no CHEF\_PIVOTAL\_KEY is set, one is
-    #     generated and returned in the response.
+    #     stored by AWS OpsWorks for Chef Automate. This private key is
+    #     required to access the Chef API. When no CHEF\_PIVOTAL\_KEY is set,
+    #     one is generated and returned in the response.
     #
     #   * `CHEF_DELIVERY_ADMIN_PASSWORD`\: The password for the administrative
     #     user in the Chef Automate GUI. The password length is a minimum of
@@ -356,10 +380,17 @@ module Aws::OpsWorksCM
     #     CHEF\_DELIVERY\_ADMIN\_PASSWORD is set, one is generated and
     #     returned in the response.
     #
+    #   **Attributes accepted in a Puppet createServer request:**
+    #
+    #   * `PUPPET_ADMIN_PASSWORD`\: To work with the Puppet Enterprise
+    #     console, a password must use ASCII characters.
+    #
+    #   ^
+    #
     # @option params [Integer] :backup_retention_count
     #   The number of automated backups that you want to keep. Whenever a new
-    #   backup is created, AWS OpsWorks for Chef Automate deletes the oldest
-    #   backups if this number is exceeded. The default value is `1`.
+    #   backup is created, AWS OpsWorks CM deletes the oldest backups if this
+    #   number is exceeded. The default value is `1`.
     #
     # @option params [required, String] :server_name
     #   The name of the server. The server name must be unique within your AWS
@@ -377,9 +408,9 @@ module Aws::OpsWorksCM
     #   instance profile you need.
     #
     # @option params [required, String] :instance_type
-    #   The Amazon EC2 instance type to use. Valid values must be specified in
-    #   the following format: `^([cm][34]|t2).*` For example, `m4.large`.
-    #   Valid values are `t2.medium`, `m4.large`, or `m4.2xlarge`.
+    #   The Amazon EC2 instance type to use. For example, `m4.large`.
+    #   Recommended instance types include `t2.medium` and greater, `m4.*`, or
+    #   `c4.xlarge` and greater.
     #
     # @option params [String] :key_pair
     #   The Amazon EC2 key pair to set for the instance. This parameter is
@@ -388,20 +419,20 @@ module Aws::OpsWorksCM
     #
     # @option params [String] :preferred_maintenance_window
     #   The start time for a one-hour period each week during which AWS
-    #   OpsWorks for Chef Automate performs maintenance on the instance. Valid
-    #   values must be specified in the following format: `DDD:HH:MM`. The
-    #   specified time is in coordinated universal time (UTC). The default
-    #   value is a random one-hour period on Tuesday, Wednesday, or Friday.
-    #   See `TimeWindowDefinition` for more information.
+    #   OpsWorks CM performs maintenance on the instance. Valid values must be
+    #   specified in the following format: `DDD:HH:MM`. The specified time is
+    #   in coordinated universal time (UTC). The default value is a random
+    #   one-hour period on Tuesday, Wednesday, or Friday. See
+    #   `TimeWindowDefinition` for more information.
     #
     #   **Example:** `Mon:08:00`, which represents a start time of every
     #   Monday at 08:00 UTC. (8:00 a.m.)
     #
     # @option params [String] :preferred_backup_window
-    #   The start time for a one-hour period during which AWS OpsWorks for
-    #   Chef Automate backs up application-level data on your server if
-    #   automated backups are enabled. Valid values must be specified in one
-    #   of the following formats:
+    #   The start time for a one-hour period during which AWS OpsWorks CM
+    #   backs up application-level data on your server if automated backups
+    #   are enabled. Valid values must be specified in one of the following
+    #   formats:
     #
     #   * `HH:MM` for daily backups
     #
@@ -421,19 +452,19 @@ module Aws::OpsWorksCM
     #   you add this parameter, the specified security groups must be within
     #   the VPC that is specified by `SubnetIds`.
     #
-    #   If you do not specify this parameter, AWS OpsWorks for Chef Automate
-    #   creates one new security group that uses TCP ports 22 and 443, open to
-    #   0.0.0.0/0 (everyone).
+    #   If you do not specify this parameter, AWS OpsWorks CM creates one new
+    #   security group that uses TCP ports 22 and 443, open to 0.0.0.0/0
+    #   (everyone).
     #
     # @option params [required, String] :service_role_arn
-    #   The service role that the AWS OpsWorks for Chef Automate service
-    #   backend uses to work with your account. Although the AWS OpsWorks
-    #   management console typically creates the service role for you, if you
-    #   are using the AWS CLI or API commands, run the
-    #   service-role-creation.yaml AWS CloudFormation template, located at
+    #   The service role that the AWS OpsWorks CM service backend uses to work
+    #   with your account. Although the AWS OpsWorks management console
+    #   typically creates the service role for you, if you are using the AWS
+    #   CLI or API commands, run the service-role-creation.yaml AWS
+    #   CloudFormation template, located at
     #   https://s3.amazonaws.com/opsworks-cm-us-east-1-prod-default-assets/misc/opsworks-cm-roles.yaml.
     #   This template creates a CloudFormation stack that includes the service
-    #   role that you need.
+    #   role and instance profile that you need.
     #
     # @option params [Array<String>] :subnet_ids
     #   The IDs of subnets in which to launch the server EC2 instance.
@@ -454,8 +485,8 @@ module Aws::OpsWorksCM
     #   [1]: http://docs.aws.amazon.com/AWSEC2/latest/UserGuide/ec2-supported-platforms.html
     #
     # @option params [String] :backup_id
-    #   If you specify this field, AWS OpsWorks for Chef Automate creates the
-    #   server by using the backup represented by BackupId.
+    #   If you specify this field, AWS OpsWorks CM creates the server by using
+    #   the backup represented by BackupId.
     #
     # @return [Types::CreateServerResponse] Returns a {Seahorse::Client::Response response} object which responds to the following methods:
     #
@@ -557,7 +588,7 @@ module Aws::OpsWorksCM
       req.send_request(options)
     end
 
-    # Deletes the server and the underlying AWS CloudFormation stack
+    # Deletes the server and the underlying AWS CloudFormation stacks
     # (including the server's EC2 instance). When you run this command, the
     # server state is updated to `DELETING`. After the server is deleted, it
     # is no longer returned by `DescribeServer` requests. If the AWS
@@ -807,8 +838,7 @@ module Aws::OpsWorksCM
 
     # Lists all configuration management servers that are identified with
     # your account. Only the stored results from Amazon DynamoDB are
-    # returned. AWS OpsWorks for Chef Automate does not query other
-    # services.
+    # returned. AWS OpsWorks CM does not query other services.
     #
     # This operation is synchronous.
     #
@@ -890,10 +920,11 @@ module Aws::OpsWorksCM
       req.send_request(options)
     end
 
-    # Disassociates a node from a Chef server, and removes the node from the
-    # Chef server's managed nodes. After a node is disassociated, the node
-    # key pair is no longer valid for accessing the Chef API. For more
-    # information about how to associate a node, see AssociateNode.
+    # Disassociates a node from an AWS OpsWorks CM server, and removes the
+    # node from the server's managed nodes. After a node is disassociated,
+    # the node key pair is no longer valid for accessing the configuration
+    # manager's API. For more information about how to associate a node,
+    # see AssociateNode.
     #
     # A node can can only be disassociated from a server that is in a
     # `HEALTHY` state. Otherwise, an `InvalidStateException` is thrown. A
@@ -905,12 +936,13 @@ module Aws::OpsWorksCM
     #   The name of the server from which to disassociate the node.
     #
     # @option params [required, String] :node_name
-    #   The name of the Chef client node.
+    #   The name of the client node.
     #
     # @option params [Array<Types::EngineAttribute>] :engine_attributes
-    #   Engine attributes used for disassociating the node.
+    #   Engine attributes that are used for disassociating the node. No
+    #   attributes are required for Puppet.
     #
-    #   **Attributes accepted in a DisassociateNode request:**
+    #   **Attributes required in a DisassociateNode request for Chef**
     #
     #   * `CHEF_ORGANIZATION`\: The Chef organization with which the node was
     #     associated. By default only one organization named `default` can
@@ -1155,8 +1187,10 @@ module Aws::OpsWorksCM
 
     # Updates engine-specific attributes on a specified server. The server
     # enters the `MODIFYING` state when this operation is in progress. Only
-    # one update can occur at a time. You can use this command to reset the
-    # Chef server's private key (`CHEF_PIVOTAL_KEY`).
+    # one update can occur at a time. You can use this command to reset a
+    # Chef server's private key (`CHEF_PIVOTAL_KEY`), a Chef server's
+    # admin password (`CHEF_DELIVERY_ADMIN_PASSWORD`), or a Puppet server's
+    # admin password (`PUPPET_ADMIN_PASSWORD`).
     #
     # This operation is asynchronous.
     #
@@ -1239,14 +1273,127 @@ module Aws::OpsWorksCM
         params: params,
         config: config)
       context[:gem_name] = 'aws-sdk-opsworkscm'
-      context[:gem_version] = '1.1.0'
+      context[:gem_version] = '1.2.0'
       Seahorse::Client::Request.new(handlers, context)
     end
 
+    # Polls an API operation until a resource enters a desired state.
+    #
+    # ## Basic Usage
+    #
+    # A waiter will call an API operation until:
+    #
+    # * It is successful
+    # * It enters a terminal state
+    # * It makes the maximum number of attempts
+    #
+    # In between attempts, the waiter will sleep.
+    #
+    #     # polls in a loop, sleeping between attempts
+    #     client.waiter_until(waiter_name, params)
+    #
+    # ## Configuration
+    #
+    # You can configure the maximum number of polling attempts, and the
+    # delay (in seconds) between each polling attempt. You can pass
+    # configuration as the final arguments hash.
+    #
+    #     # poll for ~25 seconds
+    #     client.wait_until(waiter_name, params, {
+    #       max_attempts: 5,
+    #       delay: 5,
+    #     })
+    #
+    # ## Callbacks
+    #
+    # You can be notified before each polling attempt and before each
+    # delay. If you throw `:success` or `:failure` from these callbacks,
+    # it will terminate the waiter.
+    #
+    #     started_at = Time.now
+    #     client.wait_until(waiter_name, params, {
+    #
+    #       # disable max attempts
+    #       max_attempts: nil,
+    #
+    #       # poll for 1 hour, instead of a number of attempts
+    #       before_wait: -> (attempts, response) do
+    #         throw :failure if Time.now - started_at > 3600
+    #       end
+    #     })
+    #
+    # ## Handling Errors
+    #
+    # When a waiter is unsuccessful, it will raise an error.
+    # All of the failure errors extend from
+    # {Aws::Waiters::Errors::WaiterFailed}.
+    #
+    #     begin
+    #       client.wait_until(...)
+    #     rescue Aws::Waiters::Errors::WaiterFailed
+    #       # resource did not enter the desired state in time
+    #     end
+    #
+    # ## Valid Waiters
+    #
+    # The following table lists the valid waiter names, the operations they call,
+    # and the default `:delay` and `:max_attempts` values.
+    #
+    # | waiter_name     | params                              | :delay   | :max_attempts |
+    # | --------------- | ----------------------------------- | -------- | ------------- |
+    # | node_associated | {#describe_node_association_status} | 15       | 15            |
+    #
+    # @raise [Errors::FailureStateError] Raised when the waiter terminates
+    #   because the waiter has entered a state that it will not transition
+    #   out of, preventing success.
+    #
+    # @raise [Errors::TooManyAttemptsError] Raised when the configured
+    #   maximum number of attempts have been made, and the waiter is not
+    #   yet successful.
+    #
+    # @raise [Errors::UnexpectedError] Raised when an error is encounted
+    #   while polling for a resource that is not expected.
+    #
+    # @raise [Errors::NoSuchWaiterError] Raised when you request to wait
+    #   for an unknown state.
+    #
+    # @return [Boolean] Returns `true` if the waiter was successful.
+    # @param [Symbol] waiter_name
+    # @param [Hash] params ({})
+    # @param [Hash] options ({})
+    # @option options [Integer] :max_attempts
+    # @option options [Integer] :delay
+    # @option options [Proc] :before_attempt
+    # @option options [Proc] :before_wait
+    def wait_until(waiter_name, params = {}, options = {})
+      w = waiter(waiter_name, options)
+      yield(w.waiter) if block_given? # deprecated
+      w.wait(params)
+    end
+
     # @api private
     # @deprecated
     def waiter_names
-      []
+      waiters.keys
+    end
+
+    private
+
+    # @param [Symbol] waiter_name
+    # @param [Hash] options ({})
+    def waiter(waiter_name, options = {})
+      waiter_class = waiters[waiter_name]
+      if waiter_class
+        waiter_class.new(options.merge(client: self))
+      else
+        raise Aws::Waiters::Errors::NoSuchWaiterError.new(waiter_name, waiters.keys)
+      end
+    end
+
+    def waiters
+      {
+        node_associated: Waiters::NodeAssociated
+      }
     end
 
     class << self

data/lib/aws-sdk-opsworkscm/types.rb

@@ -58,13 +58,13 @@ module Aws::OpsWorksCM
     #   @return [String]
     #
     # @!attribute [rw] node_name
-    #   The name of the Chef client node.
+    #   The name of the node.
     #   @return [String]
     #
     # @!attribute [rw] engine_attributes
     #   Engine attributes used for associating the node.
     #
-    #   **Attributes accepted in a AssociateNode request:**
+    #   **Attributes accepted in a AssociateNode request for Chef**
     #
     #   * `CHEF_ORGANIZATION`\: The Chef organization with which the node is
     #     associated. By default only one organization named `default` can
@@ -72,6 +72,13 @@ module Aws::OpsWorksCM
     #
     #   * `CHEF_NODE_PUBLIC_KEY`\: A PEM-formatted public key. This key is
     #     required for the `chef-client` agent to access the Chef API.
+    #
+    #   **Attributes accepted in a AssociateNode request for Puppet**
+    #
+    #   * `PUPPET_NODE_CSR`\: A PEM-formatted certificate-signing request
+    #     (CSR) that is created by the node.
+    #
+    #   ^
     #   @return [Array<Types::EngineAttribute>]
     #
     # @see http://docs.aws.amazon.com/goto/WebAPI/opsworkscm-2016-11-01/AssociateNodeRequest AWS API Documentation
@@ -203,8 +210,8 @@ module Aws::OpsWorksCM
     #   @return [Array<String>]
     #
     # @!attribute [rw] tools_version
-    #   The version of AWS OpsWorks for Chef Automate-specific tools that is
-    #   obtained from the server when the backup is created.
+    #   The version of AWS OpsWorks CM-specific tools that is obtained from
+    #   the server when the backup is created.
     #   @return [String]
     #
     # @!attribute [rw] user_arn
@@ -317,27 +324,29 @@ module Aws::OpsWorksCM
     #
     # @!attribute [rw] engine
     #   The configuration management engine to use. Valid values include
-    #   `Chef`.
+    #   `Chef` and `Puppet`.
     #   @return [String]
     #
     # @!attribute [rw] engine_model
-    #   The engine model, or option. Valid values include `Single`.
+    #   The engine model of the server. Valid values in this release include
+    #   `Monolithic` for Puppet and `Single` for Chef.
     #   @return [String]
     #
     # @!attribute [rw] engine_version
-    #   The major release version of the engine that you want to use. Values
-    #   depend on the engine that you choose.
+    #   The major release version of the engine that you want to use. For a
+    #   Chef server, the valid value for EngineVersion is currently `12`.
+    #   For a Puppet server, the valid value is `2017`.
     #   @return [String]
     #
     # @!attribute [rw] engine_attributes
     #   Optional engine attributes on a specified server.
     #
-    #   **Attributes accepted in a createServer request:**
+    #   **Attributes accepted in a Chef createServer request:**
     #
     #   * `CHEF_PIVOTAL_KEY`\: A base64-encoded RSA private key that is not
-    #     stored by AWS OpsWorks for Chef. This private key is required to
-    #     access the Chef API. When no CHEF\_PIVOTAL\_KEY is set, one is
-    #     generated and returned in the response.
+    #     stored by AWS OpsWorks for Chef Automate. This private key is
+    #     required to access the Chef API. When no CHEF\_PIVOTAL\_KEY is
+    #     set, one is generated and returned in the response.
     #
     #   * `CHEF_DELIVERY_ADMIN_PASSWORD`\: The password for the
     #     administrative user in the Chef Automate GUI. The password length
@@ -347,12 +356,19 @@ module Aws::OpsWorksCM
     #     case letter, one upper case letter, one number, and one special
     #     character. When no CHEF\_DELIVERY\_ADMIN\_PASSWORD is set, one is
     #     generated and returned in the response.
+    #
+    #   **Attributes accepted in a Puppet createServer request:**
+    #
+    #   * `PUPPET_ADMIN_PASSWORD`\: To work with the Puppet Enterprise
+    #     console, a password must use ASCII characters.
+    #
+    #   ^
     #   @return [Array<Types::EngineAttribute>]
     #
     # @!attribute [rw] backup_retention_count
     #   The number of automated backups that you want to keep. Whenever a
-    #   new backup is created, AWS OpsWorks for Chef Automate deletes the
-    #   oldest backups if this number is exceeded. The default value is `1`.
+    #   new backup is created, AWS OpsWorks CM deletes the oldest backups if
+    #   this number is exceeded. The default value is `1`.
     #   @return [Integer]
     #
     # @!attribute [rw] server_name
@@ -373,9 +389,9 @@ module Aws::OpsWorksCM
     #   @return [String]
     #
     # @!attribute [rw] instance_type
-    #   The Amazon EC2 instance type to use. Valid values must be specified
-    #   in the following format: `^([cm][34]|t2).*` For example, `m4.large`.
-    #   Valid values are `t2.medium`, `m4.large`, or `m4.2xlarge`.
+    #   The Amazon EC2 instance type to use. For example, `m4.large`.
+    #   Recommended instance types include `t2.medium` and greater, `m4.*`,
+    #   or `c4.xlarge` and greater.
     #   @return [String]
     #
     # @!attribute [rw] key_pair
@@ -386,21 +402,21 @@ module Aws::OpsWorksCM
     #
     # @!attribute [rw] preferred_maintenance_window
     #   The start time for a one-hour period each week during which AWS
-    #   OpsWorks for Chef Automate performs maintenance on the instance.
-    #   Valid values must be specified in the following format: `DDD:HH:MM`.
-    #   The specified time is in coordinated universal time (UTC). The
-    #   default value is a random one-hour period on Tuesday, Wednesday, or
-    #   Friday. See `TimeWindowDefinition` for more information.
+    #   OpsWorks CM performs maintenance on the instance. Valid values must
+    #   be specified in the following format: `DDD:HH:MM`. The specified
+    #   time is in coordinated universal time (UTC). The default value is a
+    #   random one-hour period on Tuesday, Wednesday, or Friday. See
+    #   `TimeWindowDefinition` for more information.
     #
     #   **Example:** `Mon:08:00`, which represents a start time of every
     #   Monday at 08:00 UTC. (8:00 a.m.)
     #   @return [String]
     #
     # @!attribute [rw] preferred_backup_window
-    #   The start time for a one-hour period during which AWS OpsWorks for
-    #   Chef Automate backs up application-level data on your server if
-    #   automated backups are enabled. Valid values must be specified in one
-    #   of the following formats:
+    #   The start time for a one-hour period during which AWS OpsWorks CM
+    #   backs up application-level data on your server if automated backups
+    #   are enabled. Valid values must be specified in one of the following
+    #   formats:
     #
     #   * `HH:MM` for daily backups
     #
@@ -421,20 +437,20 @@ module Aws::OpsWorksCM
     #   If you add this parameter, the specified security groups must be
     #   within the VPC that is specified by `SubnetIds`.
     #
-    #   If you do not specify this parameter, AWS OpsWorks for Chef Automate
-    #   creates one new security group that uses TCP ports 22 and 443, open
-    #   to 0.0.0.0/0 (everyone).
+    #   If you do not specify this parameter, AWS OpsWorks CM creates one
+    #   new security group that uses TCP ports 22 and 443, open to 0.0.0.0/0
+    #   (everyone).
     #   @return [Array<String>]
     #
     # @!attribute [rw] service_role_arn
-    #   The service role that the AWS OpsWorks for Chef Automate service
-    #   backend uses to work with your account. Although the AWS OpsWorks
-    #   management console typically creates the service role for you, if
-    #   you are using the AWS CLI or API commands, run the
-    #   service-role-creation.yaml AWS CloudFormation template, located at
+    #   The service role that the AWS OpsWorks CM service backend uses to
+    #   work with your account. Although the AWS OpsWorks management console
+    #   typically creates the service role for you, if you are using the AWS
+    #   CLI or API commands, run the service-role-creation.yaml AWS
+    #   CloudFormation template, located at
     #   https://s3.amazonaws.com/opsworks-cm-us-east-1-prod-default-assets/misc/opsworks-cm-roles.yaml.
     #   This template creates a CloudFormation stack that includes the
-    #   service role that you need.
+    #   service role and instance profile that you need.
     #   @return [String]
     #
     # @!attribute [rw] subnet_ids
@@ -458,8 +474,8 @@ module Aws::OpsWorksCM
     #   @return [Array<String>]
     #
     # @!attribute [rw] backup_id
-    #   If you specify this field, AWS OpsWorks for Chef Automate creates
-    #   the server by using the backup represented by BackupId.
+    #   If you specify this field, AWS OpsWorks CM creates the server by
+    #   using the backup represented by BackupId.
     #   @return [String]
     #
     # @see http://docs.aws.amazon.com/goto/WebAPI/opsworkscm-2016-11-01/CreateServerRequest AWS API Documentation
@@ -736,7 +752,9 @@ module Aws::OpsWorksCM
     #   @return [String]
     #
     # @!attribute [rw] engine_attributes
-    #   Attributes specific to the node association.
+    #   Attributes specific to the node association. In Puppet, the attibute
+    #   PUPPET\_NODE\_CERT contains the signed certificate (the result of
+    #   the CSR).
     #   @return [Array<Types::EngineAttribute>]
     #
     # @see http://docs.aws.amazon.com/goto/WebAPI/opsworkscm-2016-11-01/DescribeNodeAssociationStatusResponse AWS API Documentation
@@ -791,6 +809,12 @@ module Aws::OpsWorksCM
 
     # @!attribute [rw] servers
     #   Contains the response to a `DescribeServers` request.
+    #
+    #   *For Puppet Server:*
+    #   `DescribeServersResponse$Servers$EngineAttributes` contains
+    #   PUPPET\_API\_CA\_CERT. This is the PEM-encoded CA certificate that
+    #   is used by the Puppet API over TCP port number 8140. The CA
+    #   certificate is also used to sign node certificates.
     #   @return [Array<Types::Server>]
     #
     # @!attribute [rw] next_token
@@ -832,13 +856,14 @@ module Aws::OpsWorksCM
     #   @return [String]
     #
     # @!attribute [rw] node_name
-    #   The name of the Chef client node.
+    #   The name of the client node.
     #   @return [String]
     #
     # @!attribute [rw] engine_attributes
-    #   Engine attributes used for disassociating the node.
+    #   Engine attributes that are used for disassociating the node. No
+    #   attributes are required for Puppet.
     #
-    #   **Attributes accepted in a DisassociateNode request:**
+    #   **Attributes required in a DisassociateNode request for Chef**
     #
     #   * `CHEF_ORGANIZATION`\: The Chef organization with which the node
     #     was associated. By default only one organization named `default`
@@ -974,22 +999,22 @@ module Aws::OpsWorksCM
     #   @return [String]
     #
     # @!attribute [rw] engine
-    #   The engine type of the server. The valid value in this release is
-    #   `Chef`.
+    #   The engine type of the server. Valid values in this release include
+    #   `Chef` and `Puppet`.
     #   @return [String]
     #
     # @!attribute [rw] engine_model
-    #   The engine model of the server. The valid value in this release is
-    #   `Single`.
+    #   The engine model of the server. Valid values in this release include
+    #   `Monolithic` for Puppet and `Single` for Chef.
     #   @return [String]
     #
     # @!attribute [rw] engine_attributes
     #   The response of a createServer() request returns the master
     #   credential to access the server in EngineAttributes. These
-    #   credentials are not stored by AWS OpsWorks for Chef Automate; they
-    #   are returned only as part of the result of createServer().
+    #   credentials are not stored by AWS OpsWorks CM; they are returned
+    #   only as part of the result of createServer().
     #
-    #   **Attributes returned in a createServer response:**
+    #   **Attributes returned in a createServer response for Chef**
     #
     #   * `CHEF_PIVOTAL_KEY`\: A base64-encoded RSA private key that is
     #     generated by AWS OpsWorks for Chef Automate. This private key is
@@ -1001,12 +1026,23 @@ module Aws::OpsWorksCM
     #     file, unzip it, and then change to the directory where you've
     #     unzipped the file contents. From this directory, you can run Knife
     #     commands.
+    #
+    #   **Attributes returned in a createServer response for Puppet**
+    #
+    #   * `PUPPET_STARTER_KIT`\: A base64-encoded ZIP file. The ZIP file
+    #     contains a Puppet starter kit, including a README and a required
+    #     private key. Save this file, unzip it, and then change to the
+    #     directory where you've unzipped the file contents.
+    #
+    #   * `PUPPET_ADMIN_PASSWORD`\: An administrator password that you can
+    #     use to sign in to the Puppet Enterprise console after the server
+    #     is online.
     #   @return [Array<Types::EngineAttribute>]
     #
     # @!attribute [rw] engine_version
-    #   The engine version of the server. Because Chef is the engine
-    #   available in this release, the valid value for EngineVersion is
-    #   `12`.
+    #   The engine version of the server. For a Chef server, the valid value
+    #   for EngineVersion is currently `12`. For a Puppet server, the valid
+    #   value is `2017`.
     #   @return [String]
     #
     # @!attribute [rw] instance_profile_arn

data/lib/aws-sdk-opsworkscm/waiters.rb

@@ -0,0 +1,58 @@
+# WARNING ABOUT GENERATED CODE
+#
+# This file is generated. See the contributing guide for more information:
+# https://github.com/aws/aws-sdk-ruby/blob/master/CONTRIBUTING.md
+#
+# WARNING ABOUT GENERATED CODE
+
+require 'aws-sdk-core/waiters'
+
+module Aws::OpsWorksCM
+  module Waiters
+
+    # Wait until node is associated or disassociated.
+    class NodeAssociated
+
+      # @param [Hash] options
+      # @option options [required, Client] :client
+      # @option options [Integer] :max_attempts (15)
+      # @option options [Integer] :delay (15)
+      # @option options [Proc] :before_attempt
+      # @option options [Proc] :before_wait
+      def initialize(options)
+        @client = options.fetch(:client)
+        @waiter = Aws::Waiters::Waiter.new({
+          max_attempts: 15,
+          delay: 15,
+          poller: Aws::Waiters::Poller.new(
+            operation_name: :describe_node_association_status,
+            acceptors: [
+              {
+                "expected" => "SUCCESS",
+                "state" => "success",
+                "matcher" => "path",
+                "argument" => "node_association_status"
+              },
+              {
+                "expected" => "FAILED",
+                "state" => "failure",
+                "matcher" => "path",
+                "argument" => "node_association_status"
+              }
+            ]
+          )
+        }.merge(options))
+      end
+
+      # @option (see Client#describe_node_association_status)
+      # @return (see Client#describe_node_association_status)
+      def wait(params = {})
+        @waiter.wait(client: @client, params: params)
+      end
+
+      # @api private
+      attr_reader :waiter
+
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: aws-sdk-opsworkscm
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.2.0
 platform: ruby
 authors:
 - Amazon Web Services
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-10-10 00:00:00.000000000 Z
+date: 2017-11-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk-core
@@ -53,6 +53,7 @@ files:
 - lib/aws-sdk-opsworkscm/errors.rb
 - lib/aws-sdk-opsworkscm/resource.rb
 - lib/aws-sdk-opsworkscm/types.rb
+- lib/aws-sdk-opsworkscm/waiters.rb
 homepage: http://github.com/aws/aws-sdk-ruby
 licenses:
 - Apache-2.0