Skip to content

Commit

Permalink
Merge pull request #2278 from acpana/acpana/maputils
Browse files Browse the repository at this point in the history 
refactor: factor out maputils
  • Loading branch information
@google-oss-prow
google-oss-prow[bot] authored Jul 17, 2024
2 parents 8df5030 + 931597e commit 2e3ea62
Show file tree
Hide file tree
Showing 9 changed files with 103 additions and 317 deletions.
7 changes: 4 additions & 3 deletions pkg/controller/direct/alloydb/cluster_controller.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ import (

krm "github.com/GoogleCloudPlatform/k8s-config-connector/pkg/clients/generated/apis/alloydb/v1beta1"
"github.com/GoogleCloudPlatform/k8s-config-connector/pkg/config"
"github.com/GoogleCloudPlatform/k8s-config-connector/pkg/controller/direct"
"github.com/GoogleCloudPlatform/k8s-config-connector/pkg/controller/direct/directbase"
"github.com/GoogleCloudPlatform/k8s-config-connector/pkg/controller/direct/registry"
)
Expand Down Expand Up @@ -93,7 +94,7 @@ func (m *clusterModel) AdapterForObject(ctx context.Context, reader client.Reade
if projectID == "" {
return nil, fmt.Errorf("cannot resolve project")
}
mapCtx := &MapContext{
mapCtx := &direct.MapContext{
// kube: kube,
}
desired := ClusterSpecToApi(mapCtx, &obj.Spec)
Expand Down Expand Up @@ -210,7 +211,7 @@ func (a *clusterAdapter) Create(ctx context.Context, u *unstructured.Unstructure
return fmt.Errorf("setting spec.resourceID: %w", err)
}

mapCtx := &MapContext{
mapCtx := &direct.MapContext{
// kube: kube,
}
observedState := ClusterStatusFromApi(mapCtx, created)
Expand Down Expand Up @@ -285,7 +286,7 @@ func (a *clusterAdapter) Update(ctx context.Context, u *unstructured.Unstructure
latest = a.actual
}

mapCtx := &MapContext{
mapCtx := &direct.MapContext{
// kube: kube,
}
observedState := ClusterStatusFromApi(mapCtx, latest)
Expand Down
55 changes: 28 additions & 27 deletions pkg/controller/direct/alloydb/mapping.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,11 @@ package alloydb

import (
krm "github.com/GoogleCloudPlatform/k8s-config-connector/pkg/clients/generated/apis/alloydb/v1beta1"
"github.com/GoogleCloudPlatform/k8s-config-connector/pkg/controller/direct"
api "google.golang.org/api/alloydb/v1beta"
)

func ClusterSpecToApi(ctx *MapContext, in *krm.AlloyDBClusterSpec) *api.Cluster {
func ClusterSpecToApi(ctx *direct.MapContext, in *krm.AlloyDBClusterSpec) *api.Cluster {
if in == nil {
return nil
}
Expand All @@ -39,7 +40,7 @@ func ClusterSpecToApi(ctx *MapContext, in *krm.AlloyDBClusterSpec) *api.Cluster
return out
}

func NetworkConfig_KRMToApi(ctx *MapContext, in *krm.ClusterNetworkConfig) *api.NetworkConfig {
func NetworkConfig_KRMToApi(ctx *direct.MapContext, in *krm.ClusterNetworkConfig) *api.NetworkConfig {
if in == nil {
return nil
}
Expand All @@ -51,7 +52,7 @@ func NetworkConfig_KRMToApi(ctx *MapContext, in *krm.ClusterNetworkConfig) *api.

}

func AutomatedBackupPolicy_KRMToApi(ctx *MapContext, in *krm.ClusterAutomatedBackupPolicy) *api.AutomatedBackupPolicy {
func AutomatedBackupPolicy_KRMToApi(ctx *direct.MapContext, in *krm.ClusterAutomatedBackupPolicy) *api.AutomatedBackupPolicy {
if in == nil {
return nil
}
Expand All @@ -68,7 +69,7 @@ func AutomatedBackupPolicy_KRMToApi(ctx *MapContext, in *krm.ClusterAutomatedBac
return out
}

func WeeklySchedule_KRMToApi(ctx *MapContext, in *krm.ClusterWeeklySchedule) *api.WeeklySchedule {
func WeeklySchedule_KRMToApi(ctx *direct.MapContext, in *krm.ClusterWeeklySchedule) *api.WeeklySchedule {
if in == nil {
return nil
}
Expand All @@ -80,15 +81,15 @@ func WeeklySchedule_KRMToApi(ctx *MapContext, in *krm.ClusterWeeklySchedule) *ap
return out
}

func StartTimes_KRMToApi(ctx *MapContext, in []krm.ClusterStartTimes) []*api.GoogleTypeTimeOfDay {
func StartTimes_KRMToApi(ctx *direct.MapContext, in []krm.ClusterStartTimes) []*api.GoogleTypeTimeOfDay {
out := make([]*api.GoogleTypeTimeOfDay, len(in))
for i, v := range in {
out[i] = Time_KRMToApi(ctx, LazyPtr(v))
out[i] = Time_KRMToApi(ctx, direct.LazyPtr(v))
}
return out
}

func Time_KRMToApi(ctx *MapContext, in *krm.ClusterStartTimes) *api.GoogleTypeTimeOfDay {
func Time_KRMToApi(ctx *direct.MapContext, in *krm.ClusterStartTimes) *api.GoogleTypeTimeOfDay {
if in == nil {
return nil
}
Expand All @@ -101,7 +102,7 @@ func Time_KRMToApi(ctx *MapContext, in *krm.ClusterStartTimes) *api.GoogleTypeTi
return out
}

func EncryptionConfig_KRMToApi(ctx *MapContext, in *krm.ClusterEncryptionConfig) *api.EncryptionConfig {
func EncryptionConfig_KRMToApi(ctx *direct.MapContext, in *krm.ClusterEncryptionConfig) *api.EncryptionConfig {
if in == nil {
return nil
}
Expand All @@ -111,7 +112,7 @@ func EncryptionConfig_KRMToApi(ctx *MapContext, in *krm.ClusterEncryptionConfig)
return out
}

func TimeBasedRetention_KRMToApi(ctx *MapContext, in *krm.ClusterTimeBasedRetention) *api.TimeBasedRetention {
func TimeBasedRetention_KRMToApi(ctx *direct.MapContext, in *krm.ClusterTimeBasedRetention) *api.TimeBasedRetention {
if in == nil {
return nil
}
Expand All @@ -122,7 +123,7 @@ func TimeBasedRetention_KRMToApi(ctx *MapContext, in *krm.ClusterTimeBasedRetent
return out
}

func QuantityBasedRetention_KRMToApi(ctx *MapContext, in *krm.ClusterQuantityBasedRetention) *api.QuantityBasedRetention {
func QuantityBasedRetention_KRMToApi(ctx *direct.MapContext, in *krm.ClusterQuantityBasedRetention) *api.QuantityBasedRetention {
if in == nil {
return nil
}
Expand All @@ -133,7 +134,7 @@ func QuantityBasedRetention_KRMToApi(ctx *MapContext, in *krm.ClusterQuantityBas
return out
}

func ContinuousBackupConfig_KRMToApi(ctx *MapContext, in *krm.ClusterContinuousBackupConfig) *api.ContinuousBackupConfig {
func ContinuousBackupConfig_KRMToApi(ctx *direct.MapContext, in *krm.ClusterContinuousBackupConfig) *api.ContinuousBackupConfig {
if in == nil {
return nil
}
Expand All @@ -146,7 +147,7 @@ func ContinuousBackupConfig_KRMToApi(ctx *MapContext, in *krm.ClusterContinuousB
return out
}

func InitialUser_KRMToApi(ctx *MapContext, in *krm.ClusterInitialUser) *api.UserPassword {
func InitialUser_KRMToApi(ctx *direct.MapContext, in *krm.ClusterInitialUser) *api.UserPassword {
if in == nil {
return nil
}
Expand All @@ -161,70 +162,70 @@ func InitialUser_KRMToApi(ctx *MapContext, in *krm.ClusterInitialUser) *api.User
return out
}

func ClusterStatusFromApi(ctx *MapContext, in *api.Cluster) *krm.AlloyDBClusterStatus {
func ClusterStatusFromApi(ctx *direct.MapContext, in *api.Cluster) *krm.AlloyDBClusterStatus {
if in == nil {
return nil
}
out := &krm.AlloyDBClusterStatus{
BackupSource: BackupSource_KRMFromApi(ctx, in.BackupSource),
ContinuousBackupInfo: ContinuousBackupInfo_KRMFromApi(ctx, in.ContinuousBackupInfo),
DatabaseVersion: LazyPtr(in.DatabaseVersion),
DatabaseVersion: direct.LazyPtr(in.DatabaseVersion),
EncryptionInfo: EncryptionInfo_KRMFromApi(ctx, in.EncryptionInfo),
MigrationSource: MigrationSource_KRMFromApi(ctx, in.MigrationSource),
Name: LazyPtr(in.Name),
Uid: LazyPtr(in.Uid),
Name: direct.LazyPtr(in.Name),
Uid: direct.LazyPtr(in.Uid),
}
return out
}

func BackupSource_KRMFromApi(ctx *MapContext, in *api.BackupSource) []krm.ClusterBackupSourceStatus {
func BackupSource_KRMFromApi(ctx *direct.MapContext, in *api.BackupSource) []krm.ClusterBackupSourceStatus {
if in == nil {
return nil
}
out := []krm.ClusterBackupSourceStatus{
{
BackupName: LazyPtr(in.BackupName),
BackupName: direct.LazyPtr(in.BackupName),
},
}
return out
}

func ContinuousBackupInfo_KRMFromApi(ctx *MapContext, in *api.ContinuousBackupInfo) []krm.ClusterContinuousBackupInfoStatus {
func ContinuousBackupInfo_KRMFromApi(ctx *direct.MapContext, in *api.ContinuousBackupInfo) []krm.ClusterContinuousBackupInfoStatus {
if in == nil {
return nil
}
out := []krm.ClusterContinuousBackupInfoStatus{
{
EarliestRestorableTime: LazyPtr(in.EarliestRestorableTime),
EnabledTime: LazyPtr(in.EnabledTime),
EarliestRestorableTime: direct.LazyPtr(in.EarliestRestorableTime),
EnabledTime: direct.LazyPtr(in.EnabledTime),
Schedule: in.Schedule,
},
}
return out
}

func EncryptionInfo_KRMFromApi(ctx *MapContext, in *api.EncryptionInfo) []krm.ClusterEncryptionInfoStatus {
func EncryptionInfo_KRMFromApi(ctx *direct.MapContext, in *api.EncryptionInfo) []krm.ClusterEncryptionInfoStatus {
if in == nil {
return nil
}
out := []krm.ClusterEncryptionInfoStatus{
{
EncryptionType: LazyPtr(in.EncryptionType),
EncryptionType: direct.LazyPtr(in.EncryptionType),
KmsKeyVersions: in.KmsKeyVersions,
},
}
return out
}

func MigrationSource_KRMFromApi(ctx *MapContext, in *api.MigrationSource) []krm.ClusterMigrationSourceStatus {
func MigrationSource_KRMFromApi(ctx *direct.MapContext, in *api.MigrationSource) []krm.ClusterMigrationSourceStatus {
if in == nil {
return nil
}
out := []krm.ClusterMigrationSourceStatus{
{
HostPort: LazyPtr(in.HostPort),
ReferenceId: LazyPtr(in.ReferenceId),
SourceType: LazyPtr(in.SourceType),
HostPort: direct.LazyPtr(in.HostPort),
ReferenceId: direct.LazyPtr(in.ReferenceId),
SourceType: direct.LazyPtr(in.SourceType),
},
}
return out
Expand Down
43 changes: 0 additions & 43 deletions pkg/controller/direct/alloydb/maputils.go
View file

This file was deleted.

3 changes: 2 additions & 1 deletion pkg/controller/direct/cloudbuild/externalresource.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ import (
"strings"

cloudbuildpb "cloud.google.com/go/cloudbuild/apiv1/v2/cloudbuildpb"
"github.com/GoogleCloudPlatform/k8s-config-connector/pkg/controller/direct"
"github.com/GoogleCloudPlatform/k8s-config-connector/pkg/controller/direct/externalresource"
)

Expand All @@ -30,7 +31,7 @@ const (

func NewResourceRef(gcpObj *cloudbuildpb.WorkerPool) (*ResourceRef, error) {
baseResourceRef := externalresource.New(serviceBaseURL, gcpObj)
extResRef := ValueOf(baseResourceRef.Get())
extResRef := direct.ValueOf(baseResourceRef.Get())
segments := strings.Split(extResRef, "/projects/")
if len(segments) != 2 {
return nil, fmt.Errorf("externalReference should be <baseUrl>/projects/<project>/locations/<location>/workerPools/<workerPool>, got %s",
Expand Down
100 changes: 0 additions & 100 deletions pkg/controller/direct/cloudbuild/maputils.go
View file

This file was deleted.

Loading

0 comments on commit 2e3ea62

Please sign in to comment.