Skip to content

Commit

Permalink
Promoting Memorystore to GA (#12112) (#20108)
Browse files Browse the repository at this point in the history
[upstream:61370a87fcc2c9f8f9040b692b728c6ba20077e4]

Signed-off-by: Modular Magician <[email protected]>
  • Loading branch information
modular-magician authored Oct 30, 2024
1 parent bc5a76e commit 9d94f22
Show file tree
Hide file tree
Showing 14 changed files with 2,557 additions and 19 deletions.
3 changes: 3 additions & 0 deletions .changelog/12112.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
```release-note:new-resource
`google_memorystore_instance` (ga)
```
1 change: 1 addition & 0 deletions google/fwmodels/provider_model.go
Original file line number Diff line number Diff line change
Expand Up @@ -108,6 +108,7 @@ type ProviderModel struct {
LoggingCustomEndpoint types.String `tfsdk:"logging_custom_endpoint"`
LookerCustomEndpoint types.String `tfsdk:"looker_custom_endpoint"`
MemcacheCustomEndpoint types.String `tfsdk:"memcache_custom_endpoint"`
MemorystoreCustomEndpoint types.String `tfsdk:"memorystore_custom_endpoint"`
MigrationCenterCustomEndpoint types.String `tfsdk:"migration_center_custom_endpoint"`
MLEngineCustomEndpoint types.String `tfsdk:"ml_engine_custom_endpoint"`
MonitoringCustomEndpoint types.String `tfsdk:"monitoring_custom_endpoint"`
Expand Down
6 changes: 6 additions & 0 deletions google/fwprovider/framework_provider.go
Original file line number Diff line number Diff line change
Expand Up @@ -616,6 +616,12 @@ func (p *FrameworkProvider) Schema(_ context.Context, _ provider.SchemaRequest,
transport_tpg.CustomEndpointValidator(),
},
},
"memorystore_custom_endpoint": &schema.StringAttribute{
Optional: true,
Validators: []validator.String{
transport_tpg.CustomEndpointValidator(),
},
},
"migration_center_custom_endpoint": &schema.StringAttribute{
Optional: true,
Validators: []validator.String{
Expand Down
10 changes: 10 additions & 0 deletions google/fwtransport/framework_config.go
Original file line number Diff line number Diff line change
Expand Up @@ -142,6 +142,7 @@ type FrameworkProviderConfig struct {
LoggingBasePath string
LookerBasePath string
MemcacheBasePath string
MemorystoreBasePath string
MigrationCenterBasePath string
MLEngineBasePath string
MonitoringBasePath string
Expand Down Expand Up @@ -304,6 +305,7 @@ func (p *FrameworkProviderConfig) LoadAndValidateFramework(ctx context.Context,
p.LoggingBasePath = data.LoggingCustomEndpoint.ValueString()
p.LookerBasePath = data.LookerCustomEndpoint.ValueString()
p.MemcacheBasePath = data.MemcacheCustomEndpoint.ValueString()
p.MemorystoreBasePath = data.MemorystoreCustomEndpoint.ValueString()
p.MigrationCenterBasePath = data.MigrationCenterCustomEndpoint.ValueString()
p.MLEngineBasePath = data.MLEngineCustomEndpoint.ValueString()
p.MonitoringBasePath = data.MonitoringCustomEndpoint.ValueString()
Expand Down Expand Up @@ -1113,6 +1115,14 @@ func (p *FrameworkProviderConfig) HandleDefaults(ctx context.Context, data *fwmo
data.MemcacheCustomEndpoint = types.StringValue(customEndpoint.(string))
}
}
if data.MemorystoreCustomEndpoint.IsNull() {
customEndpoint := transport_tpg.MultiEnvDefault([]string{
"GOOGLE_MEMORYSTORE_CUSTOM_ENDPOINT",
}, transport_tpg.DefaultBasePaths[transport_tpg.MemorystoreBasePathKey])
if customEndpoint != nil {
data.MemorystoreCustomEndpoint = types.StringValue(customEndpoint.(string))
}
}
if data.MigrationCenterCustomEndpoint.IsNull() {
customEndpoint := transport_tpg.MultiEnvDefault([]string{
"GOOGLE_MIGRATION_CENTER_CUSTOM_ENDPOINT",
Expand Down
6 changes: 6 additions & 0 deletions google/provider/provider.go
Original file line number Diff line number Diff line change
Expand Up @@ -535,6 +535,11 @@ func Provider() *schema.Provider {
Optional: true,
ValidateFunc: transport_tpg.ValidateCustomEndpoint,
},
"memorystore_custom_endpoint": {
Type: schema.TypeString,
Optional: true,
ValidateFunc: transport_tpg.ValidateCustomEndpoint,
},
"migration_center_custom_endpoint": {
Type: schema.TypeString,
Optional: true,
Expand Down Expand Up @@ -1029,6 +1034,7 @@ func ProviderConfigure(ctx context.Context, d *schema.ResourceData, p *schema.Pr
config.LoggingBasePath = d.Get("logging_custom_endpoint").(string)
config.LookerBasePath = d.Get("looker_custom_endpoint").(string)
config.MemcacheBasePath = d.Get("memcache_custom_endpoint").(string)
config.MemorystoreBasePath = d.Get("memorystore_custom_endpoint").(string)
config.MigrationCenterBasePath = d.Get("migration_center_custom_endpoint").(string)
config.MLEngineBasePath = d.Get("ml_engine_custom_endpoint").(string)
config.MonitoringBasePath = d.Get("monitoring_custom_endpoint").(string)
Expand Down
6 changes: 4 additions & 2 deletions google/provider/provider_mmv1_resources.go
Original file line number Diff line number Diff line change
Expand Up @@ -81,6 +81,7 @@ import (
"github.com/hashicorp/terraform-provider-google/google/services/logging"
"github.com/hashicorp/terraform-provider-google/google/services/looker"
"github.com/hashicorp/terraform-provider-google/google/services/memcache"
"github.com/hashicorp/terraform-provider-google/google/services/memorystore"
"github.com/hashicorp/terraform-provider-google/google/services/migrationcenter"
"github.com/hashicorp/terraform-provider-google/google/services/mlengine"
"github.com/hashicorp/terraform-provider-google/google/services/monitoring"
Expand Down Expand Up @@ -449,9 +450,9 @@ var handwrittenIAMDatasources = map[string]*schema.Resource{
}

// Resources
// Generated resources: 482
// Generated resources: 483
// Generated IAM resources: 261
// Total generated resources: 743
// Total generated resources: 744
var generatedResources = map[string]*schema.Resource{
"google_folder_access_approval_settings": accessapproval.ResourceAccessApprovalFolderSettings(),
"google_organization_access_approval_settings": accessapproval.ResourceAccessApprovalOrganizationSettings(),
Expand Down Expand Up @@ -963,6 +964,7 @@ var generatedResources = map[string]*schema.Resource{
"google_logging_organization_settings": logging.ResourceLoggingOrganizationSettings(),
"google_looker_instance": looker.ResourceLookerInstance(),
"google_memcache_instance": memcache.ResourceMemcacheInstance(),
"google_memorystore_instance": memorystore.ResourceMemorystoreInstance(),
"google_migration_center_group": migrationcenter.ResourceMigrationCenterGroup(),
"google_migration_center_preference_set": migrationcenter.ResourceMigrationCenterPreferenceSet(),
"google_ml_engine_model": mlengine.ResourceMLEngineModel(),
Expand Down
92 changes: 92 additions & 0 deletions google/services/memorystore/memorystore_operation.go
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 memorystore

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 MemorystoreOperationWaiter struct {
Config *transport_tpg.Config
UserAgent string
Project string
tpgresource.CommonOperationWaiter
}

func (w *MemorystoreOperationWaiter) 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.MemorystoreBasePath, 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 createMemorystoreWaiter(config *transport_tpg.Config, op map[string]interface{}, project, activity, userAgent string) (*MemorystoreOperationWaiter, error) {
w := &MemorystoreOperationWaiter{
Config: config,
UserAgent: userAgent,
Project: project,
}
if err := w.CommonOperationWaiter.SetOp(op); err != nil {
return nil, err
}
return w, nil
}

// nolint: deadcode,unused
func MemorystoreOperationWaitTimeWithResponse(config *transport_tpg.Config, op map[string]interface{}, response *map[string]interface{}, project, activity, userAgent string, timeout time.Duration) error {
w, err := createMemorystoreWaiter(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 MemorystoreOperationWaitTime(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 := createMemorystoreWaiter(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)
}
Loading

0 comments on commit 9d94f22

Please sign in to comment.