fix review findings

exp/runtime/hooks/api/v1alpha1/common_types.go

@@ -83,6 +83,9 @@ const (
 // CommonRetryResponse is the data structure which contains all
 // common retry fields.
 type CommonRetryResponse struct {
+	// CommonResponse contains Status and Message fields common to all response types.
+	CommonResponse `json:",inline"`
+
 	// RetryAfterSeconds when set to a non-zero value signifies that the hook
 	// will be called again at a future time.
 	RetryAfterSeconds int32 `json:"retryAfterSeconds"`

exp/runtime/hooks/api/v1alpha1/lifecyclehooks_types.go

@@ -39,9 +39,6 @@ var _ RetryResponseObject = &BeforeClusterCreateResponse{}
 type BeforeClusterCreateResponse struct {
 	metav1.TypeMeta `json:",inline"`
 
-	// CommonResponse contains Status and Message fields common to all response types.
-	CommonResponse `json:",inline"`
-
 	// CommonRetryResponse contains RetryAfterSeconds field common to all retry response types.
 	CommonRetryResponse `json:",inline"`
 }
@@ -95,9 +92,6 @@ var _ RetryResponseObject = &BeforeClusterUpgradeResponse{}
 type BeforeClusterUpgradeResponse struct {
 	metav1.TypeMeta `json:",inline"`
 
-	// CommonResponse contains Status and Message fields common to all response types.
-	CommonResponse `json:",inline"`
-
 	// CommonRetryResponse contains RetryAfterSeconds field common to all retry response types.
 	CommonRetryResponse `json:",inline"`
 }
@@ -125,9 +119,6 @@ var _ RetryResponseObject = &AfterControlPlaneUpgradeResponse{}
 type AfterControlPlaneUpgradeResponse struct {
 	metav1.TypeMeta `json:",inline"`
 
-	// CommonResponse contains Status and Message fields common to all response types.
-	CommonResponse `json:",inline"`
-
 	// CommonRetryResponse contains RetryAfterSeconds field common to all retry response types.
 	CommonRetryResponse `json:",inline"`
 }
@@ -179,9 +170,6 @@ var _ RetryResponseObject = &BeforeClusterDeleteResponse{}
 type BeforeClusterDeleteResponse struct {
 	metav1.TypeMeta `json:",inline"`
 
-	// CommonResponse contains Status and Message fields common to all response types.
-	CommonResponse `json:",inline"`
-
 	// CommonRetryResponse contains RetryAfterSeconds field common to all retry response types.
 	CommonRetryResponse `json:",inline"`
 }

internal/runtime/client/client.go

@@ -217,18 +217,17 @@ func aggregateSuccessfulResponses(aggregatedResponse runtimehooksv1.ResponseObje
 	aggregatedResponse.SetMessage("")
 	aggregatedResponse.SetStatus(runtimehooksv1.ResponseStatusSuccess)
 
-	if _, ok := aggregatedResponse.(runtimehooksv1.RetryResponseObject); !ok {
+	aggregatedRetryResponse, ok := aggregatedResponse.(runtimehooksv1.RetryResponseObject)
+	if !ok {
 		// If the aggregated response is not a RetryResponseObject then we're done.
 		return
 	}
-
 	// Note: as all responses have the same type we can assume now that
 	// they all implement the RetryResponseObject interface.
-	aggregatedRetryableResponse := aggregatedResponse.(runtimehooksv1.RetryResponseObject)
 
 	for _, resp := range responses {
-		aggregatedRetryableResponse.SetRetryAfterSeconds(lowestNonZeroRetryAfterSeconds(
-			aggregatedRetryableResponse.GetRetryAfterSeconds(),
+		aggregatedRetryResponse.SetRetryAfterSeconds(lowestNonZeroRetryAfterSeconds(
+			aggregatedRetryResponse.GetRetryAfterSeconds(),
 			resp.(runtimehooksv1.RetryResponseObject).GetRetryAfterSeconds(),
 		))
 	}

internal/runtime/client/client_test.go

@@ -556,7 +556,7 @@ func TestClient_CallExtension(t *testing.T) {
 	}
 }
 
-func Test_client_CallAllExtensions(t *testing.T) {
+func TestClient_CallAllExtensions(t *testing.T) {
 	testHostPort := "127.0.0.1:9090"
 
 	fpFail := runtimev1.FailurePolicyFail