Broke dummies out into two versions. Tests almost working again.

Author: Joshua Reed

api/v1beta1/cloudstackcluster_webhook_test.go

@@ -22,7 +22,7 @@ import (
 	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 	infrav1 "sigs.k8s.io/cluster-api-provider-cloudstack/api/v1beta1"
-	"sigs.k8s.io/cluster-api-provider-cloudstack/test/dummies"
+	dummies "sigs.k8s.io/cluster-api-provider-cloudstack/test/dummies/v1beta1"
 )
 
 var _ = Describe("CloudStackCluster webhooks", func() {

api/v1beta2/cloudstackcluster_webhook_test.go renamed to api/v1beta1/cloudstackcluster_webhook_test.go.bak

@@ -14,15 +14,15 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package v1beta2_test
+package v1beta1_test
 
 import (
 	"context"
 
 	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 	infrav1 "sigs.k8s.io/cluster-api-provider-cloudstack/api/v1beta1"
-	"sigs.k8s.io/cluster-api-provider-cloudstack/test/dummies"
+	"sigs.k8s.io/cluster-api-provider-cloudstack/test/v1beta1/dummies"
 )
 
 var _ = Describe("CloudStackCluster webhooks", func() {

api/v1beta1/cloudstackfailuredomain_types.go

@@ -17,11 +17,12 @@ limitations under the License.
 package v1beta1_test
 
 import (
+	"time"
+
 	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	infrav1 "sigs.k8s.io/cluster-api-provider-cloudstack/api/v1beta1"
-	"time"
 )
 
 var _ = Describe("CloudStackMachine types", func() {

api/v1beta1/cloudstackmachine_types_test.go

@@ -0,0 +1,46 @@
+/*
+Copyright 2022 The Kubernetes Authors.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+package v1beta1_test
+
+import (
+	. "github.com/onsi/ginkgo/v2"
+	. "github.com/onsi/gomega"
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	infrav1 "sigs.k8s.io/cluster-api-provider-cloudstack/api/v1beta1"
+	"time"
+)
+
+var _ = Describe("CloudStackMachine types", func() {
+	var cloudStackMachine infrav1.CloudStackMachine
+
+	BeforeEach(func() { // Reset test vars to initial state.
+		cloudStackMachine = infrav1.CloudStackMachine{}
+	})
+
+	Context("When calculating time since state change", func() {
+		It("Return the correct value when the last state update time is known", func() {
+			delta := time.Duration(10 * time.Minute)
+			lastUpdated := time.Now().Add(-delta)
+			cloudStackMachine.Status.InstanceStateLastUpdated = metav1.NewTime(lastUpdated)
+			Ω(cloudStackMachine.Status.TimeSinceLastStateChange()).Should(BeNumerically("~", delta, time.Second))
+		})
+
+		It("Return a negative value when the last state update time is unknown", func() {
+			Ω(cloudStackMachine.Status.TimeSinceLastStateChange()).Should(BeNumerically("<", 0))
+		})
+	})
+})

api/v1beta1/cloudstackmachine_types_test.go.bak

@@ -20,7 +20,7 @@ import (
 	"context"
 
 	"sigs.k8s.io/cluster-api-provider-cloudstack/api/v1beta1"
-	"sigs.k8s.io/cluster-api-provider-cloudstack/test/dummies"
+	dummies "sigs.k8s.io/cluster-api-provider-cloudstack/test/dummies/v1beta1"
 
 	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"

api/v1beta1/cloudstackmachine_webhook_test.go

@@ -14,15 +14,16 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package v1beta2_test
+package v1beta1_test
 
 import (
 	"context"
+
 	"sigs.k8s.io/cluster-api-provider-cloudstack/api/v1beta1"
+	"sigs.k8s.io/cluster-api-provider-cloudstack/test/v1beta1/dummies"
 
 	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
-	"sigs.k8s.io/cluster-api-provider-cloudstack/test/dummies"
 )
 
 var _ = Describe("CloudStackMachine webhook", func() {

api/v1beta2/cloudstackmachine_webhook_test.go renamed to api/v1beta1/cloudstackmachine_webhook_test.go.bak

@@ -20,7 +20,7 @@ import (
 	"context"
 
 	"sigs.k8s.io/cluster-api-provider-cloudstack/api/v1beta1"
-	"sigs.k8s.io/cluster-api-provider-cloudstack/test/dummies"
+	dummies "sigs.k8s.io/cluster-api-provider-cloudstack/test/dummies/v1beta1"
 
 	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"

api/v1beta1/cloudstackmachinetemplate_webhook_test.go

@@ -14,15 +14,16 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package v1beta2_test
+package v1beta1_test
 
 import (
 	"context"
+
 	"sigs.k8s.io/cluster-api-provider-cloudstack/api/v1beta1"
+	"sigs.k8s.io/cluster-api-provider-cloudstack/test/v1beta1/dummies"
 
 	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
-	"sigs.k8s.io/cluster-api-provider-cloudstack/test/dummies"
 )
 
 var _ = Describe("CloudStackMachineTemplate webhook", func() {

api/v1beta2/cloudstackmachinetemplate_webhook_test.go renamed to api/v1beta1/cloudstackmachinetemplate_webhook_test.go.bak

@@ -14,18 +14,19 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package v1beta2_test
+package v1beta1_test
 
 import (
 	"context"
 	"crypto/tls"
 	"fmt"
-	"k8s.io/client-go/rest"
 	"net"
 	"path/filepath"
 	"testing"
 	"time"
 
+	"k8s.io/client-go/rest"
+
 	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 
@@ -57,10 +58,10 @@ var _ = BeforeSuite(func() {
 
 	By("bootstrapping test environment")
 	testEnv = &envtest.Environment{
-		CRDDirectoryPaths:     []string{filepath.Join("..", "..", "config", "crd", "bases")},
+		CRDDirectoryPaths:     []string{filepath.Join("../../", "config", "crd", "bases")},
 		ErrorIfCRDPathMissing: false,
 		WebhookInstallOptions: envtest.WebhookInstallOptions{
-			Paths: []string{filepath.Join("..", "..", "config", "webhook")},
+			Paths: []string{filepath.Join("../../", "config", "webhook")},
 		},
 	}