forked from GoogleCloudPlatform/k8s-config-connector
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request GoogleCloudPlatform#2364 from gemmahou/direct-cont…
…roller feat: Direct controller for ComputeForwardingRule
- Loading branch information
Showing
18 changed files
with
834 additions
and
106 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
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -109,7 +109,7 @@ func (s *RegionalForwardingRulesV1) Insert(ctx context.Context, req *pb.InsertFo | |
| OperationType: PtrTo("insert"), | ||
| User: PtrTo("[email protected]"), | ||
| } | ||
| return s.startGlobalLRO(ctx, name.Project.ID, op, func() (proto.Message, error) { | ||
| return s.startRegionalLRO(ctx, name.Project.ID, name.Region, op, func() (proto.Message, error) { | ||
| return obj, nil | ||
| }) | ||
| } | ||
|
|
@@ -134,7 +134,7 @@ func (s *RegionalForwardingRulesV1) Delete(ctx context.Context, req *pb.DeleteFo | |
| OperationType: PtrTo("delete"), | ||
| User: PtrTo("[email protected]"), | ||
| } | ||
| return s.startGlobalLRO(ctx, name.Project.ID, op, func() (proto.Message, error) { | ||
| return s.startRegionalLRO(ctx, name.Project.ID, name.Region, op, func() (proto.Message, error) { | ||
| return deleted, nil | ||
| }) | ||
| } | ||
|
|
@@ -166,7 +166,7 @@ func (s *RegionalForwardingRulesV1) SetLabels(ctx context.Context, req *pb.SetLa | |
| // SetLabels operation has EndTime in response | ||
| EndTime: PtrTo("2024-04-01T12:34:56.123456Z"), | ||
| } | ||
| return s.startGlobalLRO(ctx, name.Project.ID, op, func() (proto.Message, error) { | ||
| return s.startRegionalLRO(ctx, name.Project.ID, name.Region, op, func() (proto.Message, error) { | ||
| return obj, nil | ||
| }) | ||
| } | ||
|
|
@@ -196,7 +196,7 @@ func (s *RegionalForwardingRulesV1) SetTarget(ctx context.Context, req *pb.SetTa | |
| OperationType: PtrTo("SetTarget"), | ||
| User: PtrTo("[email protected]"), | ||
| } | ||
| return s.startGlobalLRO(ctx, name.Project.ID, op, func() (proto.Message, error) { | ||
| return s.startRegionalLRO(ctx, name.Project.ID, name.Region, op, func() (proto.Message, error) { | ||
| return obj, nil | ||
| }) | ||
| } | ||
|
|
||
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
2 changes: 1 addition & 1 deletion
2
pkg/clients/generated/apis/cloudbuild/v1beta1/cloudbuildworkerpool_types.go
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
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,100 @@ | ||
| // Copyright 2024 Google LLC | ||
| // | ||
| // Licensed under the Apache License, Version 2.0 (the "License"); | ||
| // you may not use this file except in compliance with the License. | ||
| // You may obtain a copy of the License at | ||
| // | ||
| // http://www.apache.org/licenses/LICENSE-2.0 | ||
| // | ||
| // Unless required by applicable law or agreed to in writing, software | ||
| // distributed under the License is distributed on an "AS IS" BASIS, | ||
| // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| // See the License for the specific language governing permissions and | ||
| // limitations under the License. | ||
|
|
||
| package compute | ||
|
|
||
| import ( | ||
| "context" | ||
| "fmt" | ||
| "net/http" | ||
|
|
||
| api "cloud.google.com/go/compute/apiv1" | ||
| "github.com/GoogleCloudPlatform/k8s-config-connector/pkg/config" | ||
| "google.golang.org/api/option" | ||
| ) | ||
|
|
||
| type gcpClient struct { | ||
| config config.ControllerConfig | ||
| } | ||
|
|
||
| func newGCPClient(ctx context.Context, config *config.ControllerConfig) (*gcpClient, error) { | ||
| gcpClient := &gcpClient{ | ||
| config: *config, | ||
| } | ||
| return gcpClient, nil | ||
| } | ||
|
|
||
| func (m *gcpClient) options() ([]option.ClientOption, error) { | ||
| var opts []option.ClientOption | ||
| if m.config.UserAgent != "" { | ||
| opts = append(opts, option.WithUserAgent(m.config.UserAgent)) | ||
| } | ||
| if m.config.HTTPClient != nil { | ||
| // TODO: Set UserAgent in this scenario (error is: WithHTTPClient is incompatible with gRPC dial options) | ||
|
|
||
| httpClient := &http.Client{} | ||
| *httpClient = *m.config.HTTPClient | ||
| httpClient.Transport = &optionsRoundTripper{ | ||
| config: m.config, | ||
| inner: m.config.HTTPClient.Transport, | ||
| } | ||
| opts = append(opts, option.WithHTTPClient(httpClient)) | ||
| } | ||
| if m.config.UserProjectOverride && m.config.BillingProject != "" { | ||
| opts = append(opts, option.WithQuotaProject(m.config.BillingProject)) | ||
| } | ||
|
|
||
| // TODO: support endpoints? | ||
| // if m.config.Endpoint != "" { | ||
| // opts = append(opts, option.WithEndpoint(m.config.Endpoint)) | ||
| // } | ||
|
|
||
| return opts, nil | ||
| } | ||
|
|
||
| type optionsRoundTripper struct { | ||
| config config.ControllerConfig | ||
| inner http.RoundTripper | ||
| } | ||
|
|
||
| func (m *optionsRoundTripper) RoundTrip(req *http.Request) (*http.Response, error) { | ||
| if m.config.UserAgent != "" { | ||
| req.Header.Set("User-Agent", m.config.UserAgent) | ||
| } | ||
| return m.inner.RoundTrip(req) | ||
| } | ||
|
|
||
| func (m *gcpClient) globalForwardingRuleClient(ctx context.Context) (*api.GlobalForwardingRulesClient, error) { | ||
| opts, err := m.options() | ||
| if err != nil { | ||
| return nil, err | ||
| } | ||
| client, err := api.NewGlobalForwardingRulesRESTClient(ctx, opts...) | ||
| if err != nil { | ||
| return nil, fmt.Errorf("building global ComputeForwardingRule client: %w", err) | ||
| } | ||
| return client, err | ||
| } | ||
|
|
||
| func (m *gcpClient) forwardingRuleClient(ctx context.Context) (*api.ForwardingRulesClient, error) { | ||
| opts, err := m.options() | ||
| if err != nil { | ||
| return nil, err | ||
| } | ||
| client, err := api.NewForwardingRulesRESTClient(ctx, opts...) | ||
| if err != nil { | ||
| return nil, fmt.Errorf("building ComputeForwardingRule client: %w", err) | ||
| } | ||
| return client, err | ||
| } |
Oops, something went wrong.