-
Notifications
You must be signed in to change notification settings - Fork 1.7k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Browse files
Browse the repository at this point in the history
* Create a configuration file product.yaml for product discoveryengine * Create resource DataStore configuration file template DataStore.yaml * Modify resource DataStore configuration file template to match the API resource's documented behavior * Add each API resource field to configuration file properties attribute * Add IAM support in Terraform to match DataStore API resource IAM support * Polish field contents in product configuration file. * Modify DataStore.yaml for LRO handling, parameters matching and readability improvement. * Add a DataStore create test. * Modify product name from DiscoveryEngine to Discoveryengine so that generated resource name would be google_discoveryengine_data_store * change to GA in doc (#9491) * Add value of to template into the generated tests to fix error 'fmt.Sprintf format %s reads arg #3, but call has 2 args'. * Remove Api::Product::ApiReference to match the change GoogleCloudPlatform/magic-modules#9536 * Add var collection_id to unit test examples in resource config. * Fix argument missing error in unit tests. * Update resource create unit test case fields to contain display_name, industry_vertical, content_config. * Fix errors in acceptance tests: now acc test fails at invalid parent field of CreateDataStoreRequest. * Set collection_id as default_collection. * Remove uncessary variables under unit test example. * Fix acceptance tests issues by (1) removing iam_policy and (2) adding import_format. * Clean up configs: (1) update api version for tpg-beta to v1alpha; (2) remove fields for std Update method; (3) rename structured datastore example. * Add examples and tests for all types of DataStore. * Remove redundant field project from create test examples. * Fix lint-yaml check failure. * Add field solution_types to acceptance tests to satisfy coverage requirements. * Clean up industry_vertical enum values. * Add a new query parameter createAdvancedSiteSearch to create_url. * Add a create test for advanced site search data store. * Add IAM roles/discoveryengine.admin. * Remove role config from .ci/infra/terraform/main.tf * Remove beta version in product.yaml because both ga and beta versions have the same base_url. * Rename product from Discoveryengine to DiscoveryEngine. * Remove unnecessary configs and improve description readability. * Mark property solution_types as immutable. * Add update related settings and update test. * Add delete_url for resource's Delete method. * Remove all but one test example. * Rename test example to make it more generic. * Modify first template in update test to omit all non-required fields. * Fix the update test: update display_name not data_store_id. * Modify property description: remove brackets. * Update API version from v1alpha to v1. * Support regional APIs. * Modify API reference link. --------- [upstream:22bc30cf4a1c101412f34ef2ac84b3b089f63e0c] Signed-off-by: Modular Magician <magic-modules@google.com>
- Loading branch information
1 parent
bd712c2
commit 17b403b
Showing
15 changed files
with
1,097 additions
and
2 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,3 @@ | ||
| ```release-note:new-resource | ||
| `google_discovery_engine_data_store` | ||
| ``` |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
92 changes: 92 additions & 0 deletions
92
google/services/discoveryengine/discovery_engine_operation.go
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,92 @@ | ||
| // Copyright (c) HashiCorp, Inc. | ||
| // SPDX-License-Identifier: MPL-2.0 | ||
|
|
||
| // ---------------------------------------------------------------------------- | ||
| // | ||
| // *** AUTO GENERATED CODE *** Type: MMv1 *** | ||
| // | ||
| // ---------------------------------------------------------------------------- | ||
| // | ||
| // This file is automatically generated by Magic Modules and manual | ||
| // changes will be clobbered when the file is regenerated. | ||
| // | ||
| // Please read more about how to change this file in | ||
| // .github/CONTRIBUTING.md. | ||
| // | ||
| // ---------------------------------------------------------------------------- | ||
|
|
||
| package discoveryengine | ||
|
|
||
| import ( | ||
| "encoding/json" | ||
| "errors" | ||
| "fmt" | ||
| "time" | ||
|
|
||
| "github.com/hashicorp/terraform-provider-google/google/tpgresource" | ||
| transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" | ||
| ) | ||
|
|
||
| type DiscoveryEngineOperationWaiter struct { | ||
| Config *transport_tpg.Config | ||
| UserAgent string | ||
| Project string | ||
| tpgresource.CommonOperationWaiter | ||
| } | ||
|
|
||
| func (w *DiscoveryEngineOperationWaiter) QueryOp() (interface{}, error) { | ||
| if w == nil { | ||
| return nil, fmt.Errorf("Cannot query operation, it's unset or nil.") | ||
| } | ||
| // Returns the proper get. | ||
| url := fmt.Sprintf("%s%s", w.Config.DiscoveryEngineBasePath, w.CommonOperationWaiter.Op.Name) | ||
|
|
||
| return transport_tpg.SendRequest(transport_tpg.SendRequestOptions{ | ||
| Config: w.Config, | ||
| Method: "GET", | ||
| Project: w.Project, | ||
| RawURL: url, | ||
| UserAgent: w.UserAgent, | ||
| }) | ||
| } | ||
|
|
||
| func createDiscoveryEngineWaiter(config *transport_tpg.Config, op map[string]interface{}, project, activity, userAgent string) (*DiscoveryEngineOperationWaiter, error) { | ||
| w := &DiscoveryEngineOperationWaiter{ | ||
| Config: config, | ||
| UserAgent: userAgent, | ||
| Project: project, | ||
| } | ||
| if err := w.CommonOperationWaiter.SetOp(op); err != nil { | ||
| return nil, err | ||
| } | ||
| return w, nil | ||
| } | ||
|
|
||
| // nolint: deadcode,unused | ||
| func DiscoveryEngineOperationWaitTimeWithResponse(config *transport_tpg.Config, op map[string]interface{}, response *map[string]interface{}, project, activity, userAgent string, timeout time.Duration) error { | ||
| w, err := createDiscoveryEngineWaiter(config, op, project, activity, userAgent) | ||
| if err != nil { | ||
| return err | ||
| } | ||
| if err := tpgresource.OperationWait(w, activity, timeout, config.PollInterval); err != nil { | ||
| return err | ||
| } | ||
| rawResponse := []byte(w.CommonOperationWaiter.Op.Response) | ||
| if len(rawResponse) == 0 { | ||
| return errors.New("`resource` not set in operation response") | ||
| } | ||
| return json.Unmarshal(rawResponse, response) | ||
| } | ||
|
|
||
| func DiscoveryEngineOperationWaitTime(config *transport_tpg.Config, op map[string]interface{}, project, activity, userAgent string, timeout time.Duration) error { | ||
| if val, ok := op["name"]; !ok || val == "" { | ||
| // This was a synchronous call - there is no operation to wait for. | ||
| return nil | ||
| } | ||
| w, err := createDiscoveryEngineWaiter(config, op, project, activity, userAgent) | ||
| if err != nil { | ||
| // If w is nil, the op was synchronous. | ||
| return err | ||
| } | ||
| return tpgresource.OperationWait(w, activity, timeout, config.PollInterval) | ||
| } |
Oops, something went wrong.