Skip to content

Commit

Permalink
Merge pull request #256 from modular-magician/master
Browse files Browse the repository at this point in the history
Fix Service account keys, MM-updates
  • Loading branch information
Stuart Paterson authored May 7, 2020
2 parents 6363f09 + 70f30fd commit d7cad9f
Show file tree
Hide file tree
Showing 13 changed files with 51 additions and 38 deletions.
2 changes: 1 addition & 1 deletion docs/resources/google_bigquery_dataset.md
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ Properties that can be accessed from the `google_bigquery_dataset` resource:

* `group_by_email`: An email address of a Google Group to grant access to.

* `role`: Describes the rights granted to the user specified by the other member of the access object. Primitive, Predefined and custom roles are supported. Predefined roles that have equivalent primitive roles are swapped by the API to their Primitive counterparts, and will show a diff post-create. See [official docs](https://cloud.google.com/bigquery/docs/access-control).
* `role`: Describes the rights granted to the user specified by the other member of the access object. Primitive, Predefined and custom roles are supported. Predefined roles that have equivalent primitive roles are swapped by the API to their Primitive counterparts. See [official docs](https://cloud.google.com/bigquery/docs/access-control).

* `special_group`: A special group to grant access to. Possible values include: * `projectOwners`: Owners of the enclosing project. * `projectReaders`: Readers of the enclosing project. * `projectWriters`: Writers of the enclosing project. * `allAuthenticatedUsers`: All authenticated BigQuery users.

Expand Down
14 changes: 7 additions & 7 deletions docs/resources/google_compute_backend_service.md
Original file line number Diff line number Diff line change
Expand Up @@ -60,9 +60,9 @@ Properties that can be accessed from the `google_compute_backend_service` resour

* `max_utilization`: Used when balancingMode is UTILIZATION. This ratio defines the CPU utilization target for the group. The default is 0.8. Valid range is [0.0, 1.0].

* `circuit_breakers`: (Beta only) Settings controlling the volume of connections to a backend service. This field is applicable only when the load_balancing_scheme is set to INTERNAL_SELF_MANAGED.
* `circuit_breakers`: Settings controlling the volume of connections to a backend service. This field is applicable only when the load_balancing_scheme is set to INTERNAL_SELF_MANAGED.

* `connect_timeout`: The timeout for new network connections to hosts.
* `connect_timeout`: (Beta only) The timeout for new network connections to hosts.

* `seconds`: Span of time at a resolution of a second. Must be from 0 to 315,576,000,000 inclusive.

Expand All @@ -78,7 +78,7 @@ Properties that can be accessed from the `google_compute_backend_service` resour

* `max_retries`: The maximum number of parallel retries to the backend cluster. Defaults to 3.

* `consistent_hash`: (Beta only) Consistent Hash-based load balancing can be used to provide soft session affinity based on HTTP headers, cookies or other properties. This load balancing policy is applicable only for HTTP connections. The affinity to a particular destination host will be lost when one or more hosts are added/removed from the destination service. This field specifies parameters that control consistent hashing. This field only applies if the load_balancing_scheme is set to INTERNAL_SELF_MANAGED. This field is only applicable when locality_lb_policy is set to MAGLEV or RING_HASH.
* `consistent_hash`: Consistent Hash-based load balancing can be used to provide soft session affinity based on HTTP headers, cookies or other properties. This load balancing policy is applicable only for HTTP connections. The affinity to a particular destination host will be lost when one or more hosts are added/removed from the destination service. This field specifies parameters that control consistent hashing. This field only applies if the load_balancing_scheme is set to INTERNAL_SELF_MANAGED. This field is only applicable when locality_lb_policy is set to MAGLEV or RING_HASH.

* `http_cookie`: Hash is based on HTTP Cookie. This field describes a HTTP cookie that will be used as the hash key for the consistent hash load balancer. If the cookie is not present, it will be generated. This field is applicable if the sessionAffinity is set to HTTP_COOKIE.

Expand Down Expand Up @@ -118,7 +118,7 @@ Properties that can be accessed from the `google_compute_backend_service` resour

* `creation_timestamp`: Creation timestamp in RFC3339 text format.

* `custom_request_headers`: (Beta only) Headers that the HTTP/S load balancer should add to proxied requests.
* `custom_request_headers`: Headers that the HTTP/S load balancer should add to proxied requests.

* `fingerprint`: Fingerprint of this resource. A hash of the contents stored in this object. This field is used in optimistic locking.

Expand All @@ -145,7 +145,7 @@ Properties that can be accessed from the `google_compute_backend_service` resour
* EXTERNAL
* INTERNAL_SELF_MANAGED

* `locality_lb_policy`: (Beta only) The load balancing algorithm used within the scope of the locality. The possible values are - ROUND_ROBIN - This is a simple policy in which each healthy backend is selected in round robin order. LEAST_REQUEST - An O(1) algorithm which selects two random healthy hosts and picks the host which has fewer active requests. RING_HASH - The ring/modulo hash load balancer implements consistent hashing to backends. The algorithm has the property that the addition/removal of a host from a set of N hosts only affects 1/N of the requests. RANDOM - The load balancer selects a random healthy host. ORIGINAL_DESTINATION - Backend host is selected based on the client connection metadata, i.e., connections are opened to the same address as the destination address of the incoming connection before the connection was redirected to the load balancer. MAGLEV - used as a drop in replacement for the ring hash load balancer. Maglev is not as stable as ring hash but has faster table lookup build times and host selection times. For more information about Maglev, refer to https://ai.google/research/pubs/pub44824 This field is applicable only when the load_balancing_scheme is set to INTERNAL_SELF_MANAGED.
* `locality_lb_policy`: The load balancing algorithm used within the scope of the locality. The possible values are - ROUND_ROBIN - This is a simple policy in which each healthy backend is selected in round robin order. LEAST_REQUEST - An O(1) algorithm which selects two random healthy hosts and picks the host which has fewer active requests. RING_HASH - The ring/modulo hash load balancer implements consistent hashing to backends. The algorithm has the property that the addition/removal of a host from a set of N hosts only affects 1/N of the requests. RANDOM - The load balancer selects a random healthy host. ORIGINAL_DESTINATION - Backend host is selected based on the client connection metadata, i.e., connections are opened to the same address as the destination address of the incoming connection before the connection was redirected to the load balancer. MAGLEV - used as a drop in replacement for the ring hash load balancer. Maglev is not as stable as ring hash but has faster table lookup build times and host selection times. For more information about Maglev, refer to https://ai.google/research/pubs/pub44824 This field is applicable only when the load_balancing_scheme is set to INTERNAL_SELF_MANAGED.
Possible values:
* ROUND_ROBIN
* LEAST_REQUEST
Expand All @@ -156,7 +156,7 @@ Properties that can be accessed from the `google_compute_backend_service` resour

* `name`: Name of the resource. Provided by the client when the resource is created. The name must be 1-63 characters long, and comply with RFC1035. Specifically, the name must be 1-63 characters long and match the regular expression `[a-z]([-a-z0-9]*[a-z0-9])?` which means the first character must be a lowercase letter, and all following characters must be a dash, lowercase letter, or digit, except the last character, which cannot be a dash.

* `outlier_detection`: (Beta only) Settings controlling eviction of unhealthy hosts from the load balancing pool. This field is applicable only when the load_balancing_scheme is set to INTERNAL_SELF_MANAGED.
* `outlier_detection`: Settings controlling eviction of unhealthy hosts from the load balancing pool. This field is applicable only when the load_balancing_scheme is set to INTERNAL_SELF_MANAGED.

* `base_ejection_time`: The base time that a host is ejected for. The real time is equal to the base time multiplied by the number of times the host has been ejected. Defaults to 30000ms or 30s.

Expand Down Expand Up @@ -212,7 +212,7 @@ Properties that can be accessed from the `google_compute_backend_service` resour

* `timeout_sec`: How many seconds to wait for the backend before considering it a failed request. Default is 30 seconds. Valid range is [1, 86400].

* `log_config`: (Beta only) This field denotes the logging options for the load balancer traffic served by this backend service. If logging is enabled, logs will be exported to Stackdriver.
* `log_config`: This field denotes the logging options for the load balancer traffic served by this backend service. If logging is enabled, logs will be exported to Stackdriver.

* `enable`: Whether to enable logging for the load balancer traffic served by this backend service.

Expand Down
12 changes: 6 additions & 6 deletions docs/resources/google_compute_backend_services.md
Original file line number Diff line number Diff line change
Expand Up @@ -27,28 +27,28 @@ Properties that can be accessed from the `google_compute_backend_services` resou
See [google_compute_backend_service.md](google_compute_backend_service.md) for more detailed information
* `affinity_cookie_ttl_secs`: an array of `google_compute_backend_service` affinity_cookie_ttl_sec
* `backends`: an array of `google_compute_backend_service` backends
* `circuit_breakers`: (Beta only) an array of `google_compute_backend_service` circuit_breakers
* `consistent_hashes`: (Beta only) an array of `google_compute_backend_service` consistent_hash
* `circuit_breakers`: an array of `google_compute_backend_service` circuit_breakers
* `consistent_hashes`: an array of `google_compute_backend_service` consistent_hash
* `cdn_policies`: an array of `google_compute_backend_service` cdn_policy
* `connection_drainings`: an array of `google_compute_backend_service` connection_draining
* `creation_timestamps`: an array of `google_compute_backend_service` creation_timestamp
* `custom_request_headers`: (Beta only) an array of `google_compute_backend_service` custom_request_headers
* `custom_request_headers`: an array of `google_compute_backend_service` custom_request_headers
* `fingerprints`: an array of `google_compute_backend_service` fingerprint
* `descriptions`: an array of `google_compute_backend_service` description
* `enable_cdns`: an array of `google_compute_backend_service` enable_cdn
* `health_checks`: an array of `google_compute_backend_service` health_checks
* `ids`: an array of `google_compute_backend_service` id
* `iaps`: an array of `google_compute_backend_service` iap
* `load_balancing_schemes`: an array of `google_compute_backend_service` load_balancing_scheme
* `locality_lb_policies`: (Beta only) an array of `google_compute_backend_service` locality_lb_policy
* `locality_lb_policies`: an array of `google_compute_backend_service` locality_lb_policy
* `names`: an array of `google_compute_backend_service` name
* `outlier_detections`: (Beta only) an array of `google_compute_backend_service` outlier_detection
* `outlier_detections`: an array of `google_compute_backend_service` outlier_detection
* `port_names`: an array of `google_compute_backend_service` port_name
* `protocols`: an array of `google_compute_backend_service` protocol
* `security_policies`: an array of `google_compute_backend_service` security_policy
* `session_affinities`: an array of `google_compute_backend_service` session_affinity
* `timeout_secs`: an array of `google_compute_backend_service` timeout_sec
* `log_configs`: (Beta only) an array of `google_compute_backend_service` log_config
* `log_configs`: an array of `google_compute_backend_service` log_config

## Filter Criteria
This resource supports all of the above properties as filter criteria, which can be used
Expand Down
Loading

0 comments on commit d7cad9f

Please sign in to comment.