diff --git a/apis/appcat/v1/generated.pb.go b/apis/appcat/v1/generated.pb.go index 259fd44d6b..9ef6678b3f 100644 --- a/apis/appcat/v1/generated.pb.go +++ b/apis/appcat/v1/generated.pb.go @@ -10,6 +10,7 @@ import ( proto "github.com/gogo/protobuf/proto" github_com_gogo_protobuf_sortkeys "github.com/gogo/protobuf/sortkeys" + runtime "k8s.io/apimachinery/pkg/runtime" math "math" math_bits "math/bits" @@ -240,51 +241,51 @@ func init() { } var fileDescriptor_ade2e39f600d64ee = []byte{ - // 690 bytes of a gzipped FileDescriptorProto + // 703 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xbc, 0x56, 0x4f, 0x4f, 0x13, 0x41, - 0x14, 0xef, 0x2e, 0xff, 0x07, 0x94, 0x32, 0x31, 0x5a, 0x7b, 0x58, 0x48, 0x4f, 0x5c, 0x98, 0x15, - 0x62, 0x84, 0x98, 0x78, 0x60, 0x81, 0x68, 0x13, 0x45, 0xdc, 0x46, 0x63, 0x0c, 0x89, 0x4e, 0x97, - 0x61, 0xbb, 0xd6, 0xdd, 0x19, 0x77, 0xa6, 0x8b, 0xdc, 0xfc, 0x08, 0x7e, 0x16, 0x3f, 0x84, 0xe9, - 0x91, 0x23, 0x27, 0x02, 0xf5, 0xe4, 0x57, 0x30, 0x31, 0x31, 0xb3, 0x33, 0xd4, 0xa5, 0x6b, 0xd5, - 0x12, 0xec, 0x6d, 0xde, 0xdb, 0x79, 0xbf, 0xdf, 0x6f, 0x7e, 0xef, 0xbd, 0x64, 0x41, 0x15, 0x1d, - 0xd0, 0xb8, 0x69, 0x8b, 0x90, 0xd9, 0x7e, 0x20, 0x1a, 0xad, 0x3a, 0xf2, 0x68, 0x68, 0x27, 0xbc, - 0x11, 0xd9, 0x98, 0x31, 0x0f, 0x8b, 0x25, 0xcc, 0x02, 0x4e, 0xe2, 0x84, 0xc4, 0xb6, 0x3c, 0xe9, - 0xac, 0x9d, 0x2c, 0xdb, 0x3e, 0x89, 0x48, 0x8c, 0x05, 0xd9, 0x43, 0x2c, 0xa6, 0x82, 0xc2, 0x0c, - 0x00, 0x92, 0x00, 0x48, 0x5d, 0x7d, 0xdd, 0x05, 0x40, 0xf2, 0xa4, 0xb3, 0x28, 0x59, 0x2e, 0x2f, - 0x65, 0x18, 0x7d, 0xea, 0x53, 0x3b, 0xc5, 0xa9, 0xb7, 0xf6, 0xd3, 0x28, 0x0d, 0xd2, 0x93, 0xc2, - 0x2f, 0xdf, 0x6d, 0xae, 0x71, 0x14, 0x50, 0x29, 0x23, 0xc4, 0x5e, 0x23, 0x88, 0x48, 0x7c, 0x68, - 0xb3, 0xa6, 0xaf, 0x74, 0x85, 0x44, 0xe0, 0xdf, 0xa8, 0x2a, 0xdb, 0xfd, 0xaa, 0xe2, 0x56, 0x24, - 0x82, 0x90, 0xe4, 0x0a, 0xee, 0xfd, 0xad, 0x80, 0x7b, 0x0d, 0x12, 0xe2, 0xde, 0xba, 0xca, 0x0f, - 0x13, 0x8c, 0xaf, 0x33, 0xb6, 0x81, 0x05, 0x7c, 0x03, 0x26, 0xa5, 0x9c, 0x3d, 0x2c, 0x70, 0xc9, - 0x58, 0x30, 0x16, 0xa7, 0x57, 0xee, 0x20, 0x85, 0x8a, 0xb2, 0xa8, 0x88, 0x35, 0x7d, 0xe5, 0x89, - 0xbc, 0x8d, 0x92, 0x65, 0xf4, 0xb4, 0xfe, 0x96, 0x78, 0xe2, 0x09, 0x11, 0xd8, 0x81, 0xed, 0x93, - 0xf9, 0x42, 0xe7, 0x64, 0x1e, 0xfc, 0xca, 0xb9, 0x5d, 0x54, 0xf8, 0x1e, 0x8c, 0x72, 0x46, 0xbc, - 0x92, 0xb9, 0x30, 0xb2, 0x38, 0xbd, 0xb2, 0x8e, 0x06, 0xb4, 0x1e, 0x29, 0xa1, 0xa8, 0xc6, 0x88, - 0xb7, 0x15, 0x89, 0xf8, 0xd0, 0x29, 0x6b, 0xba, 0x51, 0x99, 0xfa, 0x7e, 0x32, 0x0f, 0xd4, 0x0d, - 0x19, 0xb9, 0x29, 0x15, 0x24, 0x60, 0x9c, 0x0b, 0x2c, 0x5a, 0xbc, 0x34, 0x92, 0x3e, 0xe9, 0xc1, - 0x25, 0x49, 0x6b, 0x29, 0x88, 0x73, 0x5d, 0x13, 0x8e, 0xab, 0xd8, 0xd5, 0xe0, 0xe5, 0x55, 0x30, - 0xd5, 0x55, 0x05, 0x8b, 0x60, 0xa4, 0x49, 0x0e, 0x53, 0x0f, 0xa7, 0x5c, 0x79, 0x84, 0x37, 0xc0, - 0x58, 0x82, 0xdf, 0xb5, 0x48, 0xc9, 0x4c, 0x73, 0x2a, 0xb8, 0x6f, 0xae, 0x19, 0x95, 0xb6, 0x01, - 0xb4, 0xe8, 0xc7, 0x01, 0x17, 0x70, 0x37, 0xd7, 0x03, 0xf4, 0x6f, 0x3d, 0x90, 0xd5, 0x69, 0x07, - 0x8a, 0x5a, 0xe1, 0xe4, 0x79, 0x26, 0xe3, 0xff, 0x2e, 0x18, 0x0b, 0x04, 0x09, 0xb9, 0x6e, 0xc0, - 0xea, 0x25, 0xbd, 0x70, 0xae, 0x69, 0x8e, 0xb1, 0xaa, 0x44, 0x73, 0x15, 0x68, 0xe5, 0x19, 0x98, - 0xc9, 0x7a, 0x05, 0xd7, 0xc1, 0xac, 0x47, 0x43, 0x46, 0x79, 0x20, 0x02, 0x1a, 0x6d, 0xe3, 0x90, - 0x28, 0x4b, 0x9c, 0x5b, 0xba, 0x7c, 0x76, 0xe3, 0xe2, 0x67, 0xb7, 0xf7, 0x7e, 0xe5, 0x8b, 0x09, - 0x66, 0x6a, 0x0f, 0x1d, 0xec, 0x35, 0x5b, 0xac, 0x1a, 0xed, 0x53, 0xb8, 0x07, 0x00, 0xed, 0x4e, - 0xd6, 0x95, 0x4e, 0x69, 0x06, 0x17, 0xbe, 0x04, 0x13, 0x2c, 0xa6, 0x1e, 0xe1, 0x3c, 0x6d, 0xd8, - 0xf4, 0xca, 0x52, 0x5f, 0x0a, 0xbd, 0x5e, 0xc8, 0xc5, 0x07, 0x5b, 0x1f, 0x04, 0x89, 0x78, 0x40, - 0x23, 0x67, 0x56, 0xe3, 0x4f, 0xec, 0x28, 0x14, 0xf7, 0x1c, 0x0e, 0x26, 0x60, 0xae, 0xde, 0x7d, - 0x4d, 0x1c, 0x62, 0xf9, 0x52, 0x3d, 0x99, 0x03, 0x72, 0xdc, 0xd6, 0x1c, 0x73, 0x4e, 0x2f, 0x9e, - 0x9b, 0xa7, 0xa8, 0x7c, 0x33, 0x00, 0x7c, 0x51, 0x7b, 0xb4, 0xbd, 0x43, 0xb9, 0xf0, 0x63, 0xc2, - 0x55, 0xd1, 0x50, 0x56, 0xfe, 0x7c, 0xff, 0x94, 0x93, 0xd5, 0x81, 0x67, 0x2e, 0x2f, 0xfb, 0xcf, - 0xbb, 0x58, 0x39, 0x35, 0xc0, 0xcd, 0x7c, 0xd1, 0x10, 0xd6, 0xab, 0x71, 0x71, 0xbd, 0x36, 0xae, - 0xe0, 0xa9, 0x7d, 0x56, 0xed, 0xb3, 0x09, 0x4a, 0xfd, 0x7c, 0xc9, 0x4e, 0xaf, 0x31, 0x84, 0xe9, - 0x35, 0xff, 0xfb, 0xf4, 0xc2, 0x4d, 0x50, 0x94, 0x06, 0xd7, 0x31, 0x27, 0xd5, 0x88, 0x0b, 0x1c, - 0x79, 0x24, 0x5d, 0x9a, 0x29, 0xa7, 0xa4, 0x71, 0x8a, 0x9b, 0x3d, 0xdf, 0xdd, 0x5c, 0x85, 0xf3, - 0xbc, 0x7d, 0x66, 0x15, 0x8e, 0xce, 0xac, 0xc2, 0xf1, 0x99, 0x55, 0xf8, 0xd8, 0xb1, 0x8c, 0x76, - 0xc7, 0x32, 0x8e, 0x3a, 0x96, 0x71, 0xdc, 0xb1, 0x8c, 0xd3, 0x8e, 0x65, 0x7c, 0xfa, 0x6a, 0x15, - 0x5e, 0x0d, 0xfa, 0x43, 0xf1, 0x33, 0x00, 0x00, 0xff, 0xff, 0x82, 0x19, 0xa8, 0xdc, 0x8c, 0x08, - 0x00, 0x00, + 0x14, 0xef, 0x96, 0xff, 0x53, 0x94, 0x32, 0xf1, 0x4f, 0xed, 0x61, 0x21, 0x3d, 0x71, 0x61, 0x56, + 0x88, 0x11, 0x62, 0xe2, 0x81, 0x05, 0xa2, 0x4d, 0x14, 0x71, 0xab, 0xc6, 0x18, 0x12, 0x9d, 0x2e, + 0xc3, 0x76, 0xad, 0xbb, 0x33, 0xee, 0x4c, 0x17, 0xb9, 0xf9, 0x11, 0xfc, 0x1c, 0x7e, 0x10, 0xd3, + 0x23, 0x47, 0x4e, 0x04, 0xea, 0xc9, 0xaf, 0x60, 0x62, 0x62, 0x66, 0x67, 0x28, 0xa5, 0xdb, 0x2a, + 0x6d, 0x08, 0xb7, 0x79, 0x6f, 0xe7, 0xfd, 0x7e, 0x6f, 0x7e, 0xef, 0xfd, 0x92, 0x05, 0x65, 0xb4, + 0x4f, 0xa3, 0xba, 0x25, 0x02, 0x66, 0x79, 0xbe, 0xa8, 0x35, 0xaa, 0xc8, 0xa5, 0x81, 0x15, 0xf3, + 0x5a, 0x68, 0x61, 0xc6, 0x5c, 0x2c, 0x16, 0x31, 0xf3, 0x39, 0x89, 0x62, 0x12, 0x59, 0xf2, 0xa4, + 0xb3, 0x56, 0xbc, 0x64, 0x79, 0x24, 0x24, 0x11, 0x16, 0x64, 0x17, 0xb1, 0x88, 0x0a, 0x0a, 0x3b, + 0x00, 0x90, 0x04, 0x40, 0xea, 0xea, 0xfb, 0x36, 0x00, 0x92, 0x27, 0x9d, 0x45, 0xf1, 0x52, 0x71, + 0xb1, 0x83, 0xd1, 0xa3, 0x1e, 0xb5, 0x12, 0x9c, 0x6a, 0x63, 0x2f, 0x89, 0x92, 0x20, 0x39, 0x29, + 0xfc, 0xe2, 0x83, 0xfa, 0x2a, 0x47, 0x3e, 0x95, 0x6d, 0x04, 0xd8, 0xad, 0xf9, 0x21, 0x89, 0x0e, + 0x2c, 0x56, 0xf7, 0x54, 0x5f, 0x01, 0x11, 0xb8, 0x47, 0x57, 0x45, 0xab, 0x5f, 0x55, 0xd4, 0x08, + 0x85, 0x1f, 0x90, 0x54, 0xc1, 0xc3, 0xff, 0x15, 0x70, 0xb7, 0x46, 0x02, 0xdc, 0x5d, 0x57, 0xfa, + 0x93, 0x05, 0xe3, 0x6b, 0x8c, 0xad, 0x63, 0x01, 0x3f, 0x80, 0x49, 0xd9, 0xce, 0x2e, 0x16, 0xb8, + 0x60, 0xcc, 0x1b, 0x0b, 0xb9, 0xe5, 0xfb, 0x48, 0xa1, 0xa2, 0x4e, 0x54, 0xc4, 0xea, 0x9e, 0xd2, + 0x44, 0xde, 0x46, 0xf1, 0x12, 0x7a, 0x51, 0xfd, 0x48, 0x5c, 0xf1, 0x9c, 0x08, 0x6c, 0xc3, 0xe6, + 0xf1, 0x5c, 0xa6, 0x75, 0x3c, 0x07, 0xce, 0x73, 0x4e, 0x1b, 0x15, 0x7e, 0x06, 0xa3, 0x9c, 0x11, + 0xb7, 0x90, 0x9d, 0x1f, 0x59, 0xc8, 0x2d, 0xaf, 0xa1, 0x01, 0xa5, 0x47, 0xaa, 0x51, 0x54, 0x61, + 0xc4, 0xdd, 0x0c, 0x45, 0x74, 0x60, 0x17, 0x35, 0xdd, 0xa8, 0x4c, 0xfd, 0x3e, 0x9e, 0x03, 0xea, + 0x86, 0x8c, 0x9c, 0x84, 0x0a, 0x12, 0x30, 0xce, 0x05, 0x16, 0x0d, 0x5e, 0x18, 0x49, 0x9e, 0xf4, + 0x78, 0x48, 0xd2, 0x4a, 0x02, 0x62, 0xdf, 0xd4, 0x84, 0xe3, 0x2a, 0x76, 0x34, 0x78, 0x71, 0x05, + 0x4c, 0xb5, 0xbb, 0x82, 0x79, 0x30, 0x52, 0x27, 0x07, 0x89, 0x86, 0x53, 0x8e, 0x3c, 0xc2, 0x5b, + 0x60, 0x2c, 0xc6, 0x9f, 0x1a, 0xa4, 0x90, 0x4d, 0x72, 0x2a, 0x78, 0x94, 0x5d, 0x35, 0x4a, 0x4d, + 0x03, 0xe8, 0xa6, 0x9f, 0xf9, 0x5c, 0xc0, 0x9d, 0xd4, 0x0c, 0xd0, 0xe5, 0x66, 0x20, 0xab, 0x93, + 0x09, 0xe4, 0x75, 0x87, 0x93, 0x67, 0x99, 0x0e, 0xfd, 0x77, 0xc0, 0x98, 0x2f, 0x48, 0xc0, 0xf5, + 0x00, 0x56, 0x86, 0xd4, 0xc2, 0xbe, 0xa1, 0x39, 0xc6, 0xca, 0x12, 0xcd, 0x51, 0xa0, 0xa5, 0x97, + 0x60, 0xba, 0x53, 0x2b, 0xb8, 0x06, 0x66, 0x5c, 0x1a, 0x30, 0xca, 0x7d, 0xe1, 0xd3, 0x70, 0x0b, + 0x07, 0x44, 0x49, 0x62, 0xdf, 0xd5, 0xe5, 0x33, 0xeb, 0x17, 0x3f, 0x3b, 0xdd, 0xf7, 0x4b, 0x3f, + 0xb2, 0x60, 0xba, 0xf2, 0xc4, 0xc6, 0x6e, 0xbd, 0xc1, 0xca, 0xe1, 0x1e, 0x85, 0xbb, 0x00, 0xd0, + 0xf6, 0x66, 0x5d, 0xe9, 0x96, 0x76, 0xe0, 0xc2, 0xb7, 0x60, 0x82, 0x45, 0xd4, 0x25, 0x9c, 0x27, + 0x03, 0xcb, 0x2d, 0x2f, 0xf6, 0xa5, 0xd0, 0xf6, 0x42, 0x0e, 0xde, 0xdf, 0xfc, 0x22, 0x48, 0xc8, + 0x7d, 0x1a, 0xda, 0x33, 0x1a, 0x7f, 0x62, 0x5b, 0xa1, 0x38, 0x67, 0x70, 0x30, 0x06, 0xb3, 0xd5, + 0xf6, 0x6b, 0xa2, 0x00, 0xcb, 0x97, 0xea, 0xcd, 0x1c, 0x90, 0xe3, 0x9e, 0xe6, 0x98, 0xb5, 0xbb, + 0xf1, 0x9c, 0x34, 0x45, 0xe9, 0x97, 0x01, 0xe0, 0x9b, 0xca, 0xd3, 0xad, 0x6d, 0xca, 0x85, 0x17, + 0x11, 0xae, 0x8a, 0xae, 0xc5, 0xf2, 0x67, 0xfe, 0x53, 0x4a, 0x96, 0x07, 0xde, 0xb9, 0x74, 0xdb, + 0xff, 0xf6, 0x62, 0xe9, 0xc4, 0x00, 0x77, 0xd2, 0x45, 0xd7, 0x60, 0xaf, 0xda, 0x45, 0x7b, 0xad, + 0x5f, 0xc1, 0x53, 0xfb, 0x58, 0xed, 0x7b, 0x16, 0x14, 0xfa, 0xe9, 0x02, 0x5f, 0x9d, 0x6f, 0xaf, + 0x31, 0xcc, 0x66, 0xe5, 0x7a, 0x6e, 0x6e, 0xd4, 0x6b, 0x73, 0x87, 0x72, 0xc7, 0xed, 0xcb, 0x6e, + 0x2d, 0xdc, 0x00, 0x79, 0x29, 0x6c, 0x15, 0x73, 0x52, 0x0e, 0xb9, 0xc0, 0xa1, 0x4b, 0x12, 0xb3, + 0x4c, 0xd9, 0x05, 0x2d, 0x4b, 0x7e, 0xa3, 0xeb, 0xbb, 0x93, 0xaa, 0xb0, 0x5f, 0x37, 0x4f, 0xcd, + 0xcc, 0xe1, 0xa9, 0x99, 0x39, 0x3a, 0x35, 0x33, 0x5f, 0x5b, 0xa6, 0xd1, 0x6c, 0x99, 0xc6, 0x61, + 0xcb, 0x34, 0x8e, 0x5a, 0xa6, 0x71, 0xd2, 0x32, 0x8d, 0x6f, 0x3f, 0xcd, 0xcc, 0xbb, 0x41, 0x7f, + 0x24, 0xfe, 0x06, 0x00, 0x00, 0xff, 0xff, 0x80, 0x59, 0x03, 0x04, 0x84, 0x08, 0x00, 0x00, } func (m *AppCat) Marshal() (dAtA []byte, err error) { @@ -597,26 +598,30 @@ func (m *VSHNPostgresBackupStatus) MarshalToSizedBuffer(dAtA []byte) (int, error i = encodeVarintGenerated(dAtA, i, uint64(len(m.DatabaseInstance))) i-- dAtA[i] = 0x1a - { - size, err := m.BackupInformation.MarshalToSizedBuffer(dAtA[:i]) - if err != nil { - return 0, err + if m.BackupInformation != nil { + { + size, err := m.BackupInformation.MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintGenerated(dAtA, i, uint64(size)) } - i -= size - i = encodeVarintGenerated(dAtA, i, uint64(size)) + i-- + dAtA[i] = 0x12 } - i-- - dAtA[i] = 0x12 - { - size, err := m.Process.MarshalToSizedBuffer(dAtA[:i]) - if err != nil { - return 0, err + if m.Process != nil { + { + size, err := m.Process.MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintGenerated(dAtA, i, uint64(size)) } - i -= size - i = encodeVarintGenerated(dAtA, i, uint64(size)) + i-- + dAtA[i] = 0xa } - i-- - dAtA[i] = 0xa return len(dAtA) - i, nil } @@ -731,10 +736,14 @@ func (m *VSHNPostgresBackupStatus) Size() (n int) { } var l int _ = l - l = m.Process.Size() - n += 1 + l + sovGenerated(uint64(l)) - l = m.BackupInformation.Size() - n += 1 + l + sovGenerated(uint64(l)) + if m.Process != nil { + l = m.Process.Size() + n += 1 + l + sovGenerated(uint64(l)) + } + if m.BackupInformation != nil { + l = m.BackupInformation.Size() + n += 1 + l + sovGenerated(uint64(l)) + } l = len(m.DatabaseInstance) n += 1 + l + sovGenerated(uint64(l)) return n @@ -838,8 +847,8 @@ func (this *VSHNPostgresBackupStatus) String() string { return "nil" } s := strings.Join([]string{`&VSHNPostgresBackupStatus{`, - `Process:` + strings.Replace(strings.Replace(fmt.Sprintf("%v", this.Process), "RawExtension", "runtime.RawExtension", 1), `&`, ``, 1) + `,`, - `BackupInformation:` + strings.Replace(strings.Replace(fmt.Sprintf("%v", this.BackupInformation), "RawExtension", "runtime.RawExtension", 1), `&`, ``, 1) + `,`, + `Process:` + strings.Replace(fmt.Sprintf("%v", this.Process), "RawExtension", "runtime.RawExtension", 1) + `,`, + `BackupInformation:` + strings.Replace(fmt.Sprintf("%v", this.BackupInformation), "RawExtension", "runtime.RawExtension", 1) + `,`, `DatabaseInstance:` + fmt.Sprintf("%v", this.DatabaseInstance) + `,`, `}`, }, "") @@ -1735,6 +1744,9 @@ func (m *VSHNPostgresBackupStatus) Unmarshal(dAtA []byte) error { if postIndex > l { return io.ErrUnexpectedEOF } + if m.Process == nil { + m.Process = &runtime.RawExtension{} + } if err := m.Process.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err } @@ -1768,6 +1780,9 @@ func (m *VSHNPostgresBackupStatus) Unmarshal(dAtA []byte) error { if postIndex > l { return io.ErrUnexpectedEOF } + if m.BackupInformation == nil { + m.BackupInformation = &runtime.RawExtension{} + } if err := m.BackupInformation.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err } diff --git a/apis/appcat/v1/vshn_postgres_backup_types.go b/apis/appcat/v1/vshn_postgres_backup_types.go index 2b66c3fbe3..9f36c9c1cf 100644 --- a/apis/appcat/v1/vshn_postgres_backup_types.go +++ b/apis/appcat/v1/vshn_postgres_backup_types.go @@ -48,9 +48,9 @@ type VSHNPostgresBackup struct { // VSHNPostgresBackupStatus defines the desired state of VSHNPostgresBackup type VSHNPostgresBackupStatus struct { // Process holds status information of the backup process - Process runtime.RawExtension `json:"process,omitempty"` + Process *runtime.RawExtension `json:"process,omitempty"` // BackupInformation holds specific backup information - BackupInformation runtime.RawExtension `json:"backupInformation,omitempty"` + BackupInformation *runtime.RawExtension `json:"backupInformation,omitempty"` // DatabaseInstance is the database from which the backup has been done DatabaseInstance string `json:"databaseInstance"` } @@ -125,18 +125,18 @@ func NewVSHNPostgresBackup(backup *SGBackupInfo, db, originalNamespace string) * vshnPostgresBackup := &VSHNPostgresBackup{ ObjectMeta: backup.ObjectMeta, - Status: VSHNPostgresBackupStatus{}, } vshnPostgresBackup.Status.DatabaseInstance = db vshnPostgresBackup.Namespace = originalNamespace if backup.Process.Object != nil { - vshnPostgresBackup.Status.Process = backup.Process + vshnPostgresBackup.Status.Process = &backup.Process } if backup.BackupInformation.Object != nil { - vshnPostgresBackup.Status.BackupInformation = backup.BackupInformation + vshnPostgresBackup.Status.BackupInformation = &backup.BackupInformation } + return vshnPostgresBackup } diff --git a/apis/appcat/v1/vshn_postgres_backup_types_test.go b/apis/appcat/v1/vshn_postgres_backup_types_test.go index 8093284665..11479726d4 100644 --- a/apis/appcat/v1/vshn_postgres_backup_types_test.go +++ b/apis/appcat/v1/vshn_postgres_backup_types_test.go @@ -5,7 +5,6 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured" "k8s.io/apimachinery/pkg/runtime" - "k8s.io/apimachinery/pkg/util/json" "testing" ) @@ -23,16 +22,16 @@ func TestNewVSHNBackupFromBackInfo(t *testing.T) { "GivenNoDB_ThenNil": { backupInfo: &SGBackupInfo{ ObjectMeta: metav1.ObjectMeta{Name: "backup"}, - Process: rawFromObject(getTestProcess()), - BackupInformation: rawFromObject(getTestBI()), + Process: *rawFromObject(getTestProcess()), + BackupInformation: *rawFromObject(getTestBI()), }, namespace: "namespace", }, "GivenNoNamespace_ThenNil": { backupInfo: &SGBackupInfo{ ObjectMeta: metav1.ObjectMeta{Name: "backup"}, - Process: rawFromObject(getTestProcess()), - BackupInformation: rawFromObject(getTestBI()), + Process: *rawFromObject(getTestProcess()), + BackupInformation: *rawFromObject(getTestBI()), }, db: "db1", }, @@ -41,8 +40,8 @@ func TestNewVSHNBackupFromBackInfo(t *testing.T) { namespace: "namespace", backupInfo: &SGBackupInfo{ ObjectMeta: metav1.ObjectMeta{Name: "backup"}, - Process: rawFromObject(getTestProcess()), - BackupInformation: rawFromObject(getTestBI()), + Process: *rawFromObject(getTestProcess()), + BackupInformation: *rawFromObject(getTestBI()), }, vshnPostgresBackup: &VSHNPostgresBackup{ ObjectMeta: metav1.ObjectMeta{Name: "backup", Namespace: "namespace"}, @@ -58,7 +57,7 @@ func TestNewVSHNBackupFromBackInfo(t *testing.T) { namespace: "namespace", backupInfo: &SGBackupInfo{ ObjectMeta: metav1.ObjectMeta{Name: "backup"}, - BackupInformation: rawFromObject(getTestBI()), + BackupInformation: *rawFromObject(getTestBI()), }, vshnPostgresBackup: &VSHNPostgresBackup{ ObjectMeta: metav1.ObjectMeta{Name: "backup", Namespace: "namespace"}, @@ -73,7 +72,7 @@ func TestNewVSHNBackupFromBackInfo(t *testing.T) { namespace: "namespace", backupInfo: &SGBackupInfo{ ObjectMeta: metav1.ObjectMeta{Name: "backup"}, - Process: rawFromObject(getTestProcess()), + Process: *rawFromObject(getTestProcess()), }, vshnPostgresBackup: &VSHNPostgresBackup{ ObjectMeta: metav1.ObjectMeta{Name: "backup", Namespace: "namespace"}, @@ -109,11 +108,6 @@ func getTestBI() unstructured.Unstructured { } } -func rawFromObject(object unstructured.Unstructured) runtime.RawExtension { - return runtime.RawExtension{Object: &object} -} - -func rawFromString(str string) runtime.RawExtension { - marshal, _ := json.Marshal(str) - return runtime.RawExtension{Raw: marshal} +func rawFromObject(object unstructured.Unstructured) *runtime.RawExtension { + return &runtime.RawExtension{Object: &object} } diff --git a/apis/appcat/v1/zz_generated.deepcopy.go b/apis/appcat/v1/zz_generated.deepcopy.go index 1c63e4abd4..257cffc4e7 100644 --- a/apis/appcat/v1/zz_generated.deepcopy.go +++ b/apis/appcat/v1/zz_generated.deepcopy.go @@ -189,8 +189,16 @@ func (in *VSHNPostgresBackupList) DeepCopyObject() runtime.Object { // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. func (in *VSHNPostgresBackupStatus) DeepCopyInto(out *VSHNPostgresBackupStatus) { *out = *in - in.Process.DeepCopyInto(&out.Process) - in.BackupInformation.DeepCopyInto(&out.BackupInformation) + if in.Process != nil { + in, out := &in.Process, &out.Process + *out = new(runtime.RawExtension) + (*in).DeepCopyInto(*out) + } + if in.BackupInformation != nil { + in, out := &in.BackupInformation, &out.BackupInformation + *out = new(runtime.RawExtension) + (*in).DeepCopyInto(*out) + } } // DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new VSHNPostgresBackupStatus. diff --git a/apiserver/vshn/postgres/backup_test.go b/apiserver/vshn/postgres/backup_test.go index 80e9978dbe..d3bd9ccbcf 100644 --- a/apiserver/vshn/postgres/backup_test.go +++ b/apiserver/vshn/postgres/backup_test.go @@ -34,8 +34,8 @@ var ( }, Status: v1.VSHNPostgresBackupStatus{ DatabaseInstance: "postgres-one", - Process: runtime.RawExtension{Object: &unstructured.Unstructured{Object: map[string]interface{}{"status": "Failed"}}}, - BackupInformation: runtime.RawExtension{Object: &unstructured.Unstructured{Object: map[string]interface{}{"disk": "1GB", "cpu": "1"}}}, + Process: &runtime.RawExtension{Object: &unstructured.Unstructured{Object: map[string]interface{}{"status": "Failed"}}}, + BackupInformation: &runtime.RawExtension{Object: &unstructured.Unstructured{Object: map[string]interface{}{"disk": "1GB", "cpu": "1"}}}, }, } @@ -73,8 +73,8 @@ var ( }, Status: v1.VSHNPostgresBackupStatus{ DatabaseInstance: "postgres-two", - Process: runtime.RawExtension{Object: &unstructured.Unstructured{Object: map[string]interface{}{"status": "Completed"}}}, - BackupInformation: runtime.RawExtension{Object: &unstructured.Unstructured{Object: map[string]interface{}{"disk": "2GB", "cpu": "2"}}}, + Process: &runtime.RawExtension{Object: &unstructured.Unstructured{Object: map[string]interface{}{"status": "Completed"}}}, + BackupInformation: &runtime.RawExtension{Object: &unstructured.Unstructured{Object: map[string]interface{}{"disk": "2GB", "cpu": "2"}}}, }, } diff --git a/apiserver/vshn/postgres/table.go b/apiserver/vshn/postgres/table.go index d62d35034c..794680215e 100644 --- a/apiserver/vshn/postgres/table.go +++ b/apiserver/vshn/postgres/table.go @@ -63,8 +63,8 @@ func backupToTableRow(backup *v1.VSHNPostgresBackup) metav1.TableRow { } } -func getStoredTime(process runtime.RawExtension) string { - if process.Object != nil { +func getStoredTime(process *runtime.RawExtension) string { + if process != nil && process.Object != nil { if v, err := runtime.DefaultUnstructuredConverter.ToUnstructured(process.Object); err == nil { if storedTime, exists, _ := unstructured.NestedString(v, v1.Timing, v1.Stored); exists { return storedTime @@ -74,8 +74,8 @@ func getStoredTime(process runtime.RawExtension) string { return "" } -func getProcessStatus(process runtime.RawExtension) string { - if process.Object != nil { +func getProcessStatus(process *runtime.RawExtension) string { + if process != nil && process.Object != nil { unstructuredProcess, err := runtime.DefaultUnstructuredConverter.ToUnstructured(process.Object) if err != nil { return ""