Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix scraping Refs from attributes containing lists #441

Merged
merged 3 commits into from
Oct 7, 2024
Merged

Fix scraping Refs from attributes containing lists #441

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ed6ae5a
bug: Surface bug - scraping lists of references does not work
rickard-von-essen Oct 1, 2024
6dae02b
Fix scraping Refs from attributes containing lists
rickard-von-essen Oct 2, 2024
1ae4c81
Add license header
rickard-von-essen Oct 7, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 12 additions & 1 deletion pkg/registry/meta.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,9 +116,20 @@ func (r *Resource) findReferences(parentPath string, file *hcl.File, b *hclsynta
return refs, nil
}
for name, attr := range b.Body.Attributes {
if name == "depends_on" {
continue
}
e, ok := attr.Expr.(*hclsyntax.ScopeTraversalExpr)
if !ok {
continue
t, ok := attr.Expr.(*hclsyntax.TupleConsExpr)
if ok && len(t.Exprs) > 0 {
e, ok = t.Exprs[0].(*hclsyntax.ScopeTraversalExpr)
if !ok {
continue
}
} else {
continue
}
}
refName := name
if parentPath != "" {
Expand Down
173 changes: 173 additions & 0 deletions pkg/registry/testdata/gcp/pm.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -991,3 +991,176 @@ resources:
- (Optional) The custom object to return when a requested
resource is not found.
importStatements: []
google_network_connectivity_service_connection_policy:
subCategory: Network Connectivity
description: Manage Service Connection Policies.
name: google_network_connectivity_service_connection_policy
# title: google_network_connectivity_service_connection_policy
title: ""
examples:
- name: default
manifest: |-
{
"description": "my basic service connection policy",
"location": "us-central1",
"name": "my-network-connectivity-policy",
"network": "${google_compute_network.producer_net.id}",
"psc_config": [
{
"limit": 2,
"subnetworks": [
"${google_compute_subnetwork.producer_subnet.id}"
]
}
],
"service_class": "my-basic-service-class"
}
references:
network: google_compute_network.producer_net.id
psc_config.subnetworks: google_compute_subnetwork.producer_subnet.id
dependencies:
google_compute_network.producer_net: |-
{
"auto_create_subnetworks": false,
"name": "producer-net"
}
google_compute_subnetwork.producer_subnet: |-
{
"ip_cidr_range": "10.0.0.0/16",
"name": "producer-subnet",
"network": "${google_compute_network.producer_net.id}",
"region": "us-central1"
}
argumentDocs:
create: '- Default is 30 minutes.'
create_time: |-
-
The timestamp when the resource was created.
delete: '- Default is 30 minutes.'
description: |-
-
(Optional)
Free-text description of the resource.
effective_labels: for all of the labels present on the resource.
error.code: |-
-
(Optional)
The status code, which should be an enum value of [google.rpc.Code][].
error.details: |-
-
(Output)
A list of messages that carry the error details.
error.message: |-
-
(Optional)
A developer-facing error message.
error_info.domain: |-
-
(Optional)
The logical grouping to which the "reason" belongs.
error_info.metadata: |-
-
(Optional)
Additional structured details about this error.
error_info.reason: |-
-
(Optional)
The reason of the error.
etag: |-
-
The etag is computed by the server, and may be sent on update and delete requests to ensure the client has an up-to-date value before proceeding.
id: '- an identifier for the resource with format projects/{{project}}/locations/{{location}}/serviceConnectionPolicies/{{name}}'
infrastructure: |-
-
The type of underlying resources used to create the connection.
labels: |-
-
(Optional)
User-defined labels.
location: |-
-
(Required)
The location of the ServiceConnectionPolicy.
service_class: |-
-
(Required)
The service class identifier for which this ServiceConnectionPolicy is for. The service class identifier is a unique, symbolic representation of a ServiceClass.
It is provided by the Service Producer. Google services have a prefix of gcp. For example, gcp-cloud-sql. 3rd party services do not. For example, test-service-a3dfcx.
network: |-
-
(Required)
The resource path of the consumer network. Example: - projects/{projectNumOrId}/global/networks/{resourceId}.
name: |-
-
(Required)
The name of a ServiceConnectionPolicy. Format: projects/{project}/locations/{location}/serviceConnectionPolicies/{service_connection_policy} See: https://google.aip.dev/122#fields-representing-resource-names
project: |-
- (Optional) The ID of the project in which the resource belongs.
If it is not provided, the provider project is used.
psc_config: |-
-
(Optional)
Configuration used for Private Service Connect connections. Used when Infrastructure is PSC.
Structure is documented below.
psc_config.limit: |-
-
(Optional)
Max number of PSC connections for this policy.
psc_config.subnetworks: |-
-
(Required)
IDs of the subnetworks or fully qualified identifiers for the subnetworks
psc_connections: |-
-
Information about each Private Service Connect connection.
Structure is documented below.
psc_connections.consumer_address: |-
-
(Optional)
The resource reference of the consumer address.
psc_connections.consumer_forwarding_rule: |-
-
(Optional)
The resource reference of the PSC Forwarding Rule within the consumer VPC.
psc_connections.consumer_target_project: |-
-
(Optional)
The project where the PSC connection is created.
psc_connections.error: |-
-
(Optional)
The most recent error during operating this connection.
Structure is documented below.
psc_connections.error_info: |-
-
(Optional)
The error info for the latest error during operating this connection.
Structure is documented below.
psc_connections.error_type: |-
-
(Optional)
The error type indicates whether the error is consumer facing, producer
facing or system internal.
Possible values are: CONNECTION_ERROR_TYPE_UNSPECIFIED, ERROR_INTERNAL, ERROR_CONSUMER_SIDE, ERROR_PRODUCER_SIDE.
psc_connections.gce_operation: |-
-
(Optional)
The last Compute Engine operation to setup PSC connection.
psc_connections.psc_connection_id: |-
-
(Optional)
The PSC connection id of the PSC forwarding rule.
psc_connections.state: |-
-
(Optional)
The state of the PSC connection.
Possible values are: STATE_UNSPECIFIED, ACTIVE, CREATING, DELETING, FAILED.
terraform_labels: |-
-
The combination of labels configured directly on the resource
and default labels configured on the provider.
update: '- Default is 30 minutes.'
update_time: |-
-
The timestamp when the resource was updated.
importStatements: []
Loading
Loading