Merge pull request #4727 from MartinForReal/shafan/fixclientv2

track2 sdk: Fix: nil policy in percallpolicy option
kubernetes-sigs · Oct 8, 2023 · a9479c1 · a9479c1
2 parents de53be5 + af6f49e
commit a9479c1
Show file tree

Hide file tree

Showing 4 changed files with 65 additions and 30 deletions.
diff --git a/pkg/azclient/client-gen/generator/genclientfactory_action.go b/pkg/azclient/client-gen/generator/genclientfactory_action.go
@@ -196,7 +196,9 @@ func NewClientFactory(config *ClientFactoryConfig, armConfig *ARMClientConfig, c
 	//add ratelimit policy
 	ratelimitOption = config.GetRateLimitConfig("{{.}}")
 	rateLimitPolicy = ratelimit.NewRateLimitPolicy(ratelimitOption)
-	options.ClientOptions.PerCallPolicies = append(options.ClientOptions.PerCallPolicies, rateLimitPolicy)
+	if rateLimitPolicy != nil {
+		options.ClientOptions.PerCallPolicies = append(options.ClientOptions.PerCallPolicies, rateLimitPolicy)
+	}
 	{{- end }}	
 	{{$key}}, err := {{.PkgAlias}}.New(config.SubscriptionID, cred, options)
 	if err != nil {

diff --git a/pkg/azclient/factory_gen.go b/pkg/azclient/factory_gen.go
diff --git a/pkg/azclient/policy/retryonregionalendpoint/retry_endpoint_test.go b/pkg/azclient/policy/retryonregionalendpoint/retry_endpoint_test.go
@@ -45,13 +45,12 @@ var _ = Describe("RetryEndpoint", func() {
 									StatusCode: http.StatusOK,
 									Body:       http.NoBody,
 								}, nil
-							} else {
-								return &http.Response{
-									Request:    req.Raw(),
-									StatusCode: http.StatusOK,
-									Body:       streaming.NopCloser(strings.NewReader(`{"content":"content"}`)),
-								}, nil
 							}
+							return &http.Response{
+								Request:    req.Raw(),
+								StatusCode: http.StatusOK,
+								Body:       streaming.NopCloser(strings.NewReader(`{"content":"content"}`)),
+							}, nil
 						},
 					),
 				},
@@ -75,13 +74,12 @@ var _ = Describe("RetryEndpoint", func() {
 									ContentLength: 20,
 									Body:          streaming.NopCloser(strings.NewReader(`{"error":{"code":"ResourceGroupNotFound"}}`)),
 								}, nil
-							} else {
-								return &http.Response{
-									Request:    req.Raw(),
-									StatusCode: http.StatusOK,
-									Body:       streaming.NopCloser(strings.NewReader(`{"content":"content"}`)),
-								}, nil
 							}
+							return &http.Response{
+								Request:    req.Raw(),
+								StatusCode: http.StatusOK,
+								Body:       streaming.NopCloser(strings.NewReader(`{"content":"content"}`)),
+							}, nil
 						},
 					),
 				},

diff --git a/pkg/azclient/policy/retryrepectthrottled/throttle_test.go b/pkg/azclient/policy/retryrepectthrottled/throttle_test.go
@@ -73,6 +73,7 @@ var _ = Describe("Throttle", func() {
 			Expect(err).To(HaveOccurred())
 			throttlePolicy.RetryAfterWriter = time.Now().Add(-time.Second * 10)
 			req, err = runtime.NewRequest(context.Background(), http.MethodPut, "http://localhost:8080")
+			Expect(err).NotTo(HaveOccurred())
 			err = req.SetBody(streaming.NopCloser(strings.NewReader(`{"etag":"etag"}`)), "application/json")
 			Expect(err).NotTo(HaveOccurred())
 			_, err = pipeline.Do(req)