Skip to content

Commit

Permalink
Fix the unit tests.
Browse files Browse the repository at this point in the history
  • Loading branch information
@ishan16696
ishan16696 committed Mar 9, 2022
1 parent 3122f4a commit 52db5d8
Show file tree
Hide file tree
Showing 3 changed files with 135 additions and 319 deletions.
191 changes: 52 additions & 139 deletions controllers/compaction_lease_controller_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -535,42 +535,23 @@ func validateStoreAWSForCmpctJob(instance *druidv1alpha1.Etcd, j *batchv1.Job) {
})),
})),
}),
"AWS_REGION": MatchFields(IgnoreExtras, Fields{
"Name": Equal("AWS_REGION"),
"ValueFrom": PointTo(MatchFields(IgnoreExtras, Fields{
"SecretKeyRef": PointTo(MatchFields(IgnoreExtras, Fields{
"LocalObjectReference": MatchFields(IgnoreExtras, Fields{
"Name": Equal(instance.Spec.Backup.Store.SecretRef.Name),
}),
"Key": Equal("region"),
})),
})),
}),
"AWS_SECRET_ACCESS_KEY": MatchFields(IgnoreExtras, Fields{
"Name": Equal("AWS_SECRET_ACCESS_KEY"),
"ValueFrom": PointTo(MatchFields(IgnoreExtras, Fields{
"SecretKeyRef": PointTo(MatchFields(IgnoreExtras, Fields{
"LocalObjectReference": MatchFields(IgnoreExtras, Fields{
"Name": Equal(instance.Spec.Backup.Store.SecretRef.Name),
}),
"Key": Equal("secretAccessKey"),
})),
})),
}),
"AWS_ACCESS_KEY_ID": MatchFields(IgnoreExtras, Fields{
"Name": Equal("AWS_ACCESS_KEY_ID"),
"ValueFrom": PointTo(MatchFields(IgnoreExtras, Fields{
"SecretKeyRef": PointTo(MatchFields(IgnoreExtras, Fields{
"LocalObjectReference": MatchFields(IgnoreExtras, Fields{
"Name": Equal(instance.Spec.Backup.Store.SecretRef.Name),
}),
"Key": Equal("accessKeyID"),
})),
})),
"AWS_APPLICATION_CREDENTIALS": MatchFields(IgnoreExtras, Fields{
"Name": Equal("AWS_APPLICATION_CREDENTIALS"),
"Value": Equal("/root/etcd-backup"),
}),
}),
}),
}),
"Volumes": MatchElements(volumeIterator, IgnoreExtras, Elements{
"etcd-backup": MatchFields(IgnoreExtras, Fields{
"Name": Equal("etcd-backup"),
"VolumeSource": MatchFields(IgnoreExtras, Fields{
"Secret": PointTo(MatchFields(IgnoreExtras, Fields{
"SecretName": Equal(instance.Spec.Backup.Store.SecretRef.Name),
})),
}),
}),
}),
}),
}),
}),
Expand Down Expand Up @@ -602,31 +583,23 @@ func validateStoreAzureForCmpctJob(instance *druidv1alpha1.Etcd, j *batchv1.Job)
})),
})),
}),
"STORAGE_ACCOUNT": MatchFields(IgnoreExtras, Fields{
"Name": Equal("STORAGE_ACCOUNT"),
"ValueFrom": PointTo(MatchFields(IgnoreExtras, Fields{
"SecretKeyRef": PointTo(MatchFields(IgnoreExtras, Fields{
"LocalObjectReference": MatchFields(IgnoreExtras, Fields{
"Name": Equal(instance.Spec.Backup.Store.SecretRef.Name),
}),
"Key": Equal("storageAccount"),
})),
})),
}),
"STORAGE_KEY": MatchFields(IgnoreExtras, Fields{
"Name": Equal("STORAGE_KEY"),
"ValueFrom": PointTo(MatchFields(IgnoreExtras, Fields{
"SecretKeyRef": PointTo(MatchFields(IgnoreExtras, Fields{
"LocalObjectReference": MatchFields(IgnoreExtras, Fields{
"Name": Equal(instance.Spec.Backup.Store.SecretRef.Name),
}),
"Key": Equal("storageKey"),
})),
})),
"AZURE_APPLICATION_CREDENTIALS": MatchFields(IgnoreExtras, Fields{
"Name": Equal("AZURE_APPLICATION_CREDENTIALS"),
"Value": Equal("/root/etcd-backup"),
}),
}),
}),
}),
"Volumes": MatchElements(volumeIterator, IgnoreExtras, Elements{
"etcd-backup": MatchFields(IgnoreExtras, Fields{
"Name": Equal("etcd-backup"),
"VolumeSource": MatchFields(IgnoreExtras, Fields{
"Secret": PointTo(MatchFields(IgnoreExtras, Fields{
"SecretName": Equal(instance.Spec.Backup.Store.SecretRef.Name),
})),
}),
}),
}),
}),
}),
}),
Expand Down Expand Up @@ -658,64 +631,23 @@ func validateStoreOpenstackForCmpctJob(instance *druidv1alpha1.Etcd, j *batchv1.
})),
})),
}),
"OS_AUTH_URL": MatchFields(IgnoreExtras, Fields{
"Name": Equal("OS_AUTH_URL"),
"ValueFrom": PointTo(MatchFields(IgnoreExtras, Fields{
"SecretKeyRef": PointTo(MatchFields(IgnoreExtras, Fields{
"LocalObjectReference": MatchFields(IgnoreExtras, Fields{
"Name": Equal(instance.Spec.Backup.Store.SecretRef.Name),
}),
"Key": Equal("authURL"),
})),
})),
}),
"OS_USERNAME": MatchFields(IgnoreExtras, Fields{
"Name": Equal("OS_USERNAME"),
"ValueFrom": PointTo(MatchFields(IgnoreExtras, Fields{
"SecretKeyRef": PointTo(MatchFields(IgnoreExtras, Fields{
"LocalObjectReference": MatchFields(IgnoreExtras, Fields{
"Name": Equal(instance.Spec.Backup.Store.SecretRef.Name),
}),
"Key": Equal("username"),
})),
})),
}),
"OS_TENANT_NAME": MatchFields(IgnoreExtras, Fields{
"Name": Equal("OS_TENANT_NAME"),
"ValueFrom": PointTo(MatchFields(IgnoreExtras, Fields{
"SecretKeyRef": PointTo(MatchFields(IgnoreExtras, Fields{
"LocalObjectReference": MatchFields(IgnoreExtras, Fields{
"Name": Equal(instance.Spec.Backup.Store.SecretRef.Name),
}),
"Key": Equal("tenantName"),
})),
})),
}),
"OS_PASSWORD": MatchFields(IgnoreExtras, Fields{
"Name": Equal("OS_PASSWORD"),
"ValueFrom": PointTo(MatchFields(IgnoreExtras, Fields{
"SecretKeyRef": PointTo(MatchFields(IgnoreExtras, Fields{
"LocalObjectReference": MatchFields(IgnoreExtras, Fields{
"Name": Equal(instance.Spec.Backup.Store.SecretRef.Name),
}),
"Key": Equal("password"),
})),
})),
}),
"OS_DOMAIN_NAME": MatchFields(IgnoreExtras, Fields{
"Name": Equal("OS_DOMAIN_NAME"),
"ValueFrom": PointTo(MatchFields(IgnoreExtras, Fields{
"SecretKeyRef": PointTo(MatchFields(IgnoreExtras, Fields{
"LocalObjectReference": MatchFields(IgnoreExtras, Fields{
"Name": Equal(instance.Spec.Backup.Store.SecretRef.Name),
}),
"Key": Equal("domainName"),
})),
})),
"OPENSTACK_APPLICATION_CREDENTIALS": MatchFields(IgnoreExtras, Fields{
"Name": Equal("OPENSTACK_APPLICATION_CREDENTIALS"),
"Value": Equal("/root/etcd-backup"),
}),
}),
}),
}),
"Volumes": MatchElements(volumeIterator, IgnoreExtras, Elements{
"etcd-backup": MatchFields(IgnoreExtras, Fields{
"Name": Equal("etcd-backup"),
"VolumeSource": MatchFields(IgnoreExtras, Fields{
"Secret": PointTo(MatchFields(IgnoreExtras, Fields{
"SecretName": Equal(instance.Spec.Backup.Store.SecretRef.Name),
})),
}),
}),
}),
}),
}),
}),
Expand Down Expand Up @@ -748,42 +680,23 @@ func validateStoreAlicloudForCmpctJob(instance *druidv1alpha1.Etcd, j *batchv1.J
})),
})),
}),
"ALICLOUD_ENDPOINT": MatchFields(IgnoreExtras, Fields{
"Name": Equal("ALICLOUD_ENDPOINT"),
"ValueFrom": PointTo(MatchFields(IgnoreExtras, Fields{
"SecretKeyRef": PointTo(MatchFields(IgnoreExtras, Fields{
"LocalObjectReference": MatchFields(IgnoreExtras, Fields{
"Name": Equal(instance.Spec.Backup.Store.SecretRef.Name),
}),
"Key": Equal("storageEndpoint"),
})),
})),
}),
"ALICLOUD_ACCESS_KEY_SECRET": MatchFields(IgnoreExtras, Fields{
"Name": Equal("ALICLOUD_ACCESS_KEY_SECRET"),
"ValueFrom": PointTo(MatchFields(IgnoreExtras, Fields{
"SecretKeyRef": PointTo(MatchFields(IgnoreExtras, Fields{
"LocalObjectReference": MatchFields(IgnoreExtras, Fields{
"Name": Equal(instance.Spec.Backup.Store.SecretRef.Name),
}),
"Key": Equal("accessKeySecret"),
})),
})),
}),
"ALICLOUD_ACCESS_KEY_ID": MatchFields(IgnoreExtras, Fields{
"Name": Equal("ALICLOUD_ACCESS_KEY_ID"),
"ValueFrom": PointTo(MatchFields(IgnoreExtras, Fields{
"SecretKeyRef": PointTo(MatchFields(IgnoreExtras, Fields{
"LocalObjectReference": MatchFields(IgnoreExtras, Fields{
"Name": Equal(instance.Spec.Backup.Store.SecretRef.Name),
}),
"Key": Equal("accessKeyID"),
})),
})),
"ALICLOUD_APPLICATION_CREDENTIALS": MatchFields(IgnoreExtras, Fields{
"Name": Equal("ALICLOUD_APPLICATION_CREDENTIALS"),
"Value": Equal("/root/etcd-backup"),
}),
}),
}),
}),
"Volumes": MatchElements(volumeIterator, IgnoreExtras, Elements{
"etcd-backup": MatchFields(IgnoreExtras, Fields{
"Name": Equal("etcd-backup"),
"VolumeSource": MatchFields(IgnoreExtras, Fields{
"Secret": PointTo(MatchFields(IgnoreExtras, Fields{
"SecretName": Equal(instance.Spec.Backup.Store.SecretRef.Name),
})),
}),
}),
}),
}),
}),
}),
Expand Down
Loading

0 comments on commit 52db5d8

Please sign in to comment.