Skip to content

Commit

Permalink
update docs (#5568) (#10821)
Browse files Browse the repository at this point in the history
Signed-off-by: Modular Magician <magic-modules@google.com>
  • Loading branch information
modular-magician authored Jan 3, 2022
1 parent 32f0b6e commit 3830071
Show file tree
Hide file tree
Showing 4 changed files with 33 additions and 24 deletions.
3 changes: 3 additions & 0 deletions .changelog/5568.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
```release-note:none

```
9 changes: 6 additions & 3 deletions google/resource_compute_firewall.go
Original file line number Diff line number Diff line change
Expand Up @@ -278,7 +278,8 @@ sourceTags may be set. If both properties are set, the firewall will
apply to traffic that has source IP address within sourceRanges OR the
source IP that belongs to a tag listed in the sourceTags property. The
connection does not need to match both properties for the firewall to
apply. Only IPv4 is supported.`,
apply. Only IPv4 is supported. For INGRESS traffic, one of 'source_ranges',
'source_tags' or 'source_service_accounts' is required.`,
Elem: &schema.Schema{
Type: schema.TypeString,
},
Expand All @@ -298,7 +299,8 @@ apply to traffic that has source IP address within sourceRanges OR the
source IP belongs to an instance with service account listed in
sourceServiceAccount. The connection does not need to match both
properties for the firewall to apply. sourceServiceAccounts cannot be
used at the same time as sourceTags or targetTags.`,
used at the same time as sourceTags or targetTags. For INGRESS traffic,
one of 'source_ranges', 'source_tags' or 'source_service_accounts' is required.`,
MaxItems: 10,
Elem: &schema.Schema{
Type: schema.TypeString,
Expand All @@ -317,7 +319,8 @@ address. One or both of sourceRanges and sourceTags may be set. If
both properties are set, the firewall will apply to traffic that has
source IP address within sourceRanges OR the source IP that belongs to
a tag listed in the sourceTags property. The connection does not need
to match both properties for the firewall to apply.`,
to match both properties for the firewall to apply. For INGRESS traffic,
one of 'source_ranges', 'source_tags' or 'source_service_accounts' is required.`,
Elem: &schema.Schema{
Type: schema.TypeString,
},
Expand Down
9 changes: 6 additions & 3 deletions website/docs/r/compute_firewall.html.markdown
Original file line number Diff line number Diff line change
Expand Up @@ -179,7 +179,8 @@ The following arguments are supported:
apply to traffic that has source IP address within sourceRanges OR the
source IP that belongs to a tag listed in the sourceTags property. The
connection does not need to match both properties for the firewall to
apply. Only IPv4 is supported.
apply. Only IPv4 is supported. For INGRESS traffic, one of `source_ranges`,
`source_tags` or `source_service_accounts` is required.

* `source_service_accounts` -
(Optional)
Expand All @@ -193,7 +194,8 @@ The following arguments are supported:
source IP belongs to an instance with service account listed in
sourceServiceAccount. The connection does not need to match both
properties for the firewall to apply. sourceServiceAccounts cannot be
used at the same time as sourceTags or targetTags.
used at the same time as sourceTags or targetTags. For INGRESS traffic,
one of `source_ranges`, `source_tags` or `source_service_accounts` is required.

* `source_tags` -
(Optional)
Expand All @@ -205,7 +207,8 @@ The following arguments are supported:
both properties are set, the firewall will apply to traffic that has
source IP address within sourceRanges OR the source IP that belongs to
a tag listed in the sourceTags property. The connection does not need
to match both properties for the firewall to apply.
to match both properties for the firewall to apply. For INGRESS traffic,
one of `source_ranges`, `source_tags` or `source_service_accounts` is required.

* `target_service_accounts` -
(Optional)
Expand Down
36 changes: 18 additions & 18 deletions website/docs/r/os_config_os_policy_assignment.html.markdown
Original file line number Diff line number Diff line change
Expand Up @@ -703,6 +703,24 @@ The `disruption_budget` block supports:
(Optional)
Specifies the relative value defined as a percentage, which will be multiplied by a reference value.

The `source` block supports:

* `allow_insecure` -
(Optional)
Defaults to false. When false, files are subject to validations based on the file type: Remote: A checksum must be specified. Cloud Storage: An object generation number must be specified.

* `gcs` -
(Optional)
A Cloud Storage object.

* `local_path` -
(Optional)
A local path within the VM to use.

* `remote` -
(Optional)
A generic remote file.

- - -

* `description` -
Expand Down Expand Up @@ -952,24 +970,6 @@ The `zypper` block supports:
(Required)
Required. A one word, unique name for this repository. This is the `repo id` in the zypper config file and also the `display_name` if `display_name` is omitted. This id is also used as the unique identifier when checking for GuestPolicy conflicts.

The `file` block supports:

* `allow_insecure` -
(Optional)
Defaults to false. When false, files are subject to validations based on the file type: Remote: A checksum must be specified. Cloud Storage: An object generation number must be specified.

* `gcs` -
(Optional)
A Cloud Storage object.

* `local_path` -
(Optional)
A local path within the VM to use.

* `remote` -
(Optional)
A generic remote file.

The `gcs` block supports:

* `bucket` -
Expand Down

0 comments on commit 3830071

Please sign in to comment.