proto helpers

grafana · May 21, 2024 · 218525d · 218525d
1 parent 0a5fbac
commit 218525d
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 10 deletions.
diff --git a/backend/admission_test.go b/backend/admission_test.go
@@ -19,9 +19,7 @@ func TestInstanceSettingsAdmissionConversions(t *testing.T) {
 				"A": "B",
 			},
 		}
-		wire, err := before.ToProto()
-		require.NoError(t, err)
-		after, err := backend.DataSourceInstanceSettingsFromProto(wire, "")
+		after, err := backend.DataSourceInstanceSettingsFromProto(before.ProtoBytes(), "")
 		require.NoError(t, err)
 		require.Equal(t, before.URL, after.URL)
 		require.Equal(t, before.User, after.User)
@@ -37,9 +35,7 @@ func TestInstanceSettingsAdmissionConversions(t *testing.T) {
 				"A": "B",
 			},
 		}
-		wire, err := before.ToProto()
-		require.NoError(t, err)
-		after, err := backend.AppInstanceSettingsFromProto(wire)
+		after, err := backend.AppInstanceSettingsFromProto(before.ProtoBytes())
 		require.NoError(t, err)
 		require.Equal(t, before.JSONData, after.JSONData)
 		require.Equal(t, before.DecryptedSecureJSONData, after.DecryptedSecureJSONData)

diff --git a/backend/common.go b/backend/common.go
@@ -66,8 +66,10 @@ func (s *AppInstanceSettings) GVK() GroupVersionKind {
 	}
 }
 
-func (s *AppInstanceSettings) ToProto() ([]byte, error) {
-	return proto.Marshal(ConvertToProtobuf{}.AppInstanceSettings(s))
+// ProtoBytes returns the settings the the byte structure expected by admission hooks
+func (s *AppInstanceSettings) ProtoBytes() []byte {
+	v, _ := proto.Marshal(ConvertToProtobuf{}.AppInstanceSettings(s))
+	return v
 }
 
 func AppInstanceSettingsFromProto(body []byte) (*AppInstanceSettings, error) {
@@ -179,8 +181,10 @@ func (s *DataSourceInstanceSettings) GVK() GroupVersionKind {
 	}
 }
 
-func (s *DataSourceInstanceSettings) ToProto() ([]byte, error) {
-	return proto.Marshal(ConvertToProtobuf{}.DataSourceInstanceSettings(s))
+// ProtoBytes returns the settings the the byte structure expected by admission hooks
+func (s *DataSourceInstanceSettings) ProtoBytes() []byte {
+	v, _ := proto.Marshal(ConvertToProtobuf{}.DataSourceInstanceSettings(s))
+	return v
 }
 
 func DataSourceInstanceSettingsFromProto(body []byte, pluginID string) (*DataSourceInstanceSettings, error) {