Make RPCOptions fields pointers:

This allows for the fields to not be included when nil is various applications. Signed-off-by: Jacob Weinstock <jakobweinstock@gmail.com>
tinkerbell · Sep 28, 2023 · 71a983d · 71a983d
1 parent eaffeb8
commit 71a983d
Show file tree

Hide file tree

Showing 4 changed files with 26 additions and 10 deletions.
diff --git a/api/v1alpha1/provider_opts.go b/api/v1alpha1/provider_opts.go
@@ -45,16 +45,16 @@ type RPCOptions struct {
 	LogNotificationsDisabled bool `json:"logNotificationsDisabled"`
 	// Request is the options used to create the rpc HTTP request.
 	// +optional
-	Request RequestOpts `json:"request"`
+	Request *RequestOpts `json:"request"`
 	// Signature is the options used for adding an HMAC signature to an HTTP request.
 	// +optional
-	Signature SignatureOpts `json:"signature"`
+	Signature *SignatureOpts `json:"signature"`
 	// HMAC is the options used to create a HMAC signature.
 	// +optional
-	HMAC HMACOpts `json:"hmac"`
+	HMAC *HMACOpts `json:"hmac"`
 	// Experimental options.
 	// +optional
-	Experimental ExperimentalOpts `json:"experimental"`
+	Experimental *ExperimentalOpts `json:"experimental"`
 }
 
 // RequestOpts are the options used when creating an HTTP request.

diff --git a/api/v1alpha1/zz_generated.deepcopy.go b/api/v1alpha1/zz_generated.deepcopy.go
diff --git a/controller/machine_test.go b/controller/machine_test.go
@@ -161,7 +161,7 @@ func createMachineWithRPC(secret *corev1.Secret) *v1alpha1.Machine {
 				ProviderOptions: &v1alpha1.ProviderOptions{
 					RPC: &v1alpha1.RPCOptions{
 						ConsumerURL: "http://127.0.0.1:7777",
-						HMAC: v1alpha1.HMACOpts{
+						HMAC: &v1alpha1.HMACOpts{
 							Secrets: v1alpha1.HMACSecrets{
 								"sha256": []corev1.SecretReference{
 									{

diff --git a/controller/task_test.go b/controller/task_test.go
@@ -276,7 +276,7 @@ func createTaskWithRPC(name string, action v1alpha1.Action, secret *corev1.Secre
 				ProviderOptions: &v1alpha1.ProviderOptions{
 					RPC: &v1alpha1.RPCOptions{
 						ConsumerURL: "http://127.0.0.1:7777",
-						HMAC: v1alpha1.HMACOpts{
+						HMAC: &v1alpha1.HMACOpts{
 							Secrets: v1alpha1.HMACSecrets{
 								"sha256": []corev1.SecretReference{
 									{