|
|
@@ -558,8 +558,6 @@ func (in *IBMProvider) DeepCopy() *IBMProvider {
|
|
|
}
|
|
|
|
|
|
// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
|
|
|
-<<<<<<< HEAD
|
|
|
-=======
|
|
|
func (in *OracleAuth) DeepCopyInto(out *OracleAuth) {
|
|
|
*out = *in
|
|
|
in.SecretRef.DeepCopyInto(&out.SecretRef)
|
|
|
@@ -613,7 +611,6 @@ func (in *OracleSecretRef) DeepCopy() *OracleSecretRef {
|
|
|
}
|
|
|
|
|
|
// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
|
|
|
->>>>>>> ea35f90... Restoring files from rebase issue
|
|
|
func (in *SecretStore) DeepCopyInto(out *SecretStore) {
|
|
|
*out = *in
|
|
|
out.TypeMeta = in.TypeMeta
|
|
|
@@ -695,6 +692,11 @@ func (in *SecretStoreProvider) DeepCopyInto(out *SecretStoreProvider) {
|
|
|
*out = new(GCPSMProvider)
|
|
|
(*in).DeepCopyInto(*out)
|
|
|
}
|
|
|
+ if in.Oracle != nil {
|
|
|
+ in, out := &in.Oracle, &out.Oracle
|
|
|
+ *out = new(OracleProvider)
|
|
|
+ (*in).DeepCopyInto(*out)
|
|
|
+ }
|
|
|
if in.IBM != nil {
|
|
|
in, out := &in.IBM, &out.IBM
|
|
|
*out = new(IBMProvider)
|
Kian