wip

kyma-project · Feb 6, 2025 · 879389a · 879389a
1 parent 09a653f
commit 879389a
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 106 deletions.
diff --git a/cmd/broker/broker_suite_test.go b/cmd/broker/broker_suite_test.go
@@ -6,6 +6,7 @@ import (
 	"encoding/json"
 	"fmt"
 	"io"
+	corev1 "k8s.io/api/core/v1"
 	"log/slog"
 	"net/http"
 	"net/http/httptest"
@@ -990,10 +991,6 @@ func (s *BrokerSuiteTest) AssertNetworkFilteringDisabled(iid string, expected bo
 	assert.Equal(s.t, !expected, runtime.Spec.Security.Networking.Filter.Egress.Enabled)
 }
 
-func (s *BrokerSuiteTest) FinishUpdatingOperationByKIM(id string) {
-	// todo: implement me
-}
-
 func (s *BrokerSuiteTest) failRuntimeByKIM(iid string) {
 	s.poller.Invoke(func() (bool, error) {
 		var runtimes imv1.RuntimeList
@@ -1019,12 +1016,11 @@ func (s *BrokerSuiteTest) FinishDeprovisioningOperationByKIM(opID string) {
 	s.k8sDeletionObjectTracker.ProcessRuntimeDeletion(runtime.Name)
 }
 
-func (s *BrokerSuiteTest) FailDeprovisioningOperationByProvisioner(id string) {
-	// todo: remove me
-}
-
-func (s *BrokerSuiteTest) FailNextDeprovisionings() {
-	//s.k8sKcp.PrependReactor("update", "runtimes", func(action k8stesting.Action) (handled bool, ret runtime.Object, err error) {
+func (s *BrokerSuiteTest) AssertBTPOperatorSecret() {
+	secret := &corev1.Secret{}
+	err := s.k8sSKR.Get(context.Background(), client.ObjectKey{Namespace: "kyma-installer", Name: "btp-operator"}, secret)
+	require.NoError(s.t, err)
+	assert.Equal(s.t, "btp-operator", secret.Name)
 }
 
 func assertResourcesAreRemoved(t *testing.T, gvk schema.GroupVersionKind, k8sClient client.Client) {

diff --git a/cmd/broker/expiration_test.go b/cmd/broker/expiration_test.go
@@ -245,7 +245,6 @@ func TestExpiration(t *testing.T) {
 				assert.Equal(t, http.StatusAccepted, resp.StatusCode)
 
 				deprovisioningOpID := suite.DecodeOperationID(resp)
-				suite.FailDeprovisioningOperationByProvisioner(deprovisioningOpID)
 				suite.WaitForOperationState(deprovisioningOpID, domain.Failed)
 
 				// when

diff --git a/cmd/broker/metrics_test.go b/cmd/broker/metrics_test.go
@@ -178,13 +178,11 @@ func TestMetrics(t *testing.T) {
 		assert.Nil(t, op10)
 
 		opID = deleteReq(instance6)
-		suite.FailDeprovisioningOperationByProvisioner(opID)
 		suite.WaitForOperationState(opID, domain.Failed)
 		op11 := suite.GetOperation(opID)
 		assert.NotNil(t, op11)
 
 		opID = deleteReq(instance3)
-		suite.FailDeprovisioningOperationByProvisioner(opID)
 		suite.WaitForOperationState(opID, domain.Failed)
 		op12 := suite.GetOperation(opID)
 		assert.NotNil(t, op12)

diff --git a/cmd/broker/update_test.go b/cmd/broker/update_test.go
@@ -261,8 +261,6 @@ func TestUpdate_SapConvergedCloud(t *testing.T) {
 	assert.Equal(t, http.StatusAccepted, resp.StatusCode)
 	upgradeOperationID := suite.DecodeOperationID(resp)
 
-	suite.FinishUpdatingOperationByKIM(upgradeOperationID)
-
 	suite.WaitForOperationState(upgradeOperationID, domain.Succeeded)
 
 	runtime := suite.GetRuntimeResourceByInstanceID(iid)
@@ -386,8 +384,6 @@ func TestUpdateWithNoOIDCParams(t *testing.T) {
 	assert.Equal(t, http.StatusAccepted, resp.StatusCode)
 	upgradeOperationID := suite.DecodeOperationID(resp)
 
-	suite.FinishUpdatingOperationByKIM(upgradeOperationID)
-
 	suite.WaitForOperationState(upgradeOperationID, domain.Succeeded)
 
 	runtime := suite.GetRuntimeResourceByInstanceID(iid)
@@ -459,8 +455,6 @@ func TestUpdateWithNoOidcOnUpdate(t *testing.T) {
 	assert.Equal(t, http.StatusAccepted, resp.StatusCode)
 	upgradeOperationID := suite.DecodeOperationID(resp)
 
-	suite.FinishUpdatingOperationByKIM(upgradeOperationID)
-
 	suite.WaitForOperationState(upgradeOperationID, domain.Succeeded)
 
 	runtime := suite.GetRuntimeResourceByInstanceID(iid)
@@ -871,8 +865,6 @@ func TestUpdateDefaultAdminNotChanged(t *testing.T) {
 	upgradeOperationID := suite.DecodeOperationID(resp)
 	assert.NotEmpty(t, upgradeOperationID)
 
-	suite.FinishUpdatingOperationByKIM(upgradeOperationID)
-
 	// then
 	suite.WaitForOperationState(upgradeOperationID, domain.Succeeded)
 	runtime := suite.GetRuntimeResourceByInstanceID(id)
@@ -935,8 +927,6 @@ func TestUpdateDefaultAdminNotChangedWithCustomOIDC(t *testing.T) {
 	upgradeOperationID := suite.DecodeOperationID(resp)
 	assert.NotEmpty(t, upgradeOperationID)
 
-	suite.FinishUpdatingOperationByKIM(upgradeOperationID)
-
 	// then
 	suite.WaitForOperationState(upgradeOperationID, domain.Succeeded)
 
@@ -1009,8 +999,6 @@ func TestUpdateDefaultAdminNotChangedWithOIDCUpdate(t *testing.T) {
 	upgradeOperationID := suite.DecodeOperationID(resp)
 	assert.NotEmpty(t, upgradeOperationID)
 
-	suite.FinishUpdatingOperationByKIM(upgradeOperationID)
-
 	// then
 	suite.WaitForOperationState(upgradeOperationID, domain.Succeeded)
 	runtime := suite.GetRuntimeResourceByInstanceID(id)
@@ -1076,8 +1064,6 @@ func TestUpdateDefaultAdminOverwritten(t *testing.T) {
 	upgradeOperationID := suite.DecodeOperationID(resp)
 	assert.NotEmpty(t, upgradeOperationID)
 
-	suite.FinishUpdatingOperationByKIM(upgradeOperationID)
-
 	// then
 	suite.WaitForOperationState(upgradeOperationID, domain.Succeeded)
 	runtime := suite.GetRuntimeResourceByInstanceID(id)
@@ -1140,8 +1126,6 @@ func TestUpdateCustomAdminsNotChanged(t *testing.T) {
 	upgradeOperationID := suite.DecodeOperationID(resp)
 	assert.NotEmpty(t, upgradeOperationID)
 
-	suite.FinishUpdatingOperationByKIM(upgradeOperationID)
-
 	// then
 	suite.WaitForOperationState(upgradeOperationID, domain.Succeeded)
 	time.Sleep(time.Second)
@@ -1213,8 +1197,6 @@ func TestUpdateCustomAdminsNotChangedWithOIDCUpdate(t *testing.T) {
 	upgradeOperationID := suite.DecodeOperationID(resp)
 	assert.NotEmpty(t, upgradeOperationID)
 
-	suite.FinishUpdatingOperationByKIM(upgradeOperationID)
-
 	// then
 	suite.WaitForOperationState(upgradeOperationID, domain.Succeeded)
 	runtime := suite.GetRuntimeResourceByInstanceID(id)
@@ -1283,8 +1265,6 @@ func TestUpdateCustomAdminsOverwritten(t *testing.T) {
 	upgradeOperationID := suite.DecodeOperationID(resp)
 	assert.NotEmpty(t, upgradeOperationID)
 
-	suite.FinishUpdatingOperationByKIM(upgradeOperationID)
-
 	// then
 	suite.WaitForOperationState(upgradeOperationID, domain.Succeeded)
 
@@ -1358,7 +1338,6 @@ func TestUpdateCustomAdminsOverwrittenWithOIDCUpdate(t *testing.T) {
 
 	// when
 	upgradeOperationID := suite.DecodeOperationID(resp)
-	suite.FinishUpdatingOperationByKIM(upgradeOperationID)
 
 	// then
 	suite.WaitForOperationState(upgradeOperationID, domain.Succeeded)
@@ -1429,8 +1408,6 @@ func TestUpdateCustomAdminsOverwrittenTwice(t *testing.T) {
 	upgradeOperationID := suite.DecodeOperationID(resp)
 	assert.NotEmpty(t, upgradeOperationID)
 
-	suite.FinishUpdatingOperationByKIM(upgradeOperationID)
-
 	// then
 	suite.WaitForOperationState(upgradeOperationID, domain.Succeeded)
 
@@ -1463,7 +1440,6 @@ func TestUpdateCustomAdminsOverwrittenTwice(t *testing.T) {
 
 	// when
 	upgradeOperationID = suite.DecodeOperationID(resp)
-	suite.FinishUpdatingOperationByKIM(upgradeOperationID)
 	suite.WaitForOperationState(upgradeOperationID, domain.Succeeded)
 
 	runtime = suite.GetRuntimeResourceByInstanceID(id)
@@ -1528,7 +1504,6 @@ func TestUpdateAutoscalerParams(t *testing.T) {
 	// when
 	upgradeOperationID := suite.DecodeOperationID(resp)
 	assert.NotEmpty(t, upgradeOperationID)
-	suite.FinishUpdatingOperationByKIM(upgradeOperationID)
 
 	min, max, surge, unav := 15, 25, 10, 7
 	// then
@@ -1673,7 +1648,6 @@ func TestUpdateAutoscalerPartialSequence(t *testing.T) {
 	upgradeOperationID := suite.DecodeOperationID(resp)
 	assert.NotEmpty(t, upgradeOperationID)
 
-	suite.FinishUpdatingOperationByKIM(upgradeOperationID)
 	suite.WaitForOperationState(upgradeOperationID, domain.Succeeded)
 
 	runtime := suite.GetRuntimeResourceByInstanceID(id)
@@ -1698,7 +1672,6 @@ func TestUpdateAutoscalerPartialSequence(t *testing.T) {
 	suite.WaitForOperationState(upgradeOperationID, domain.Succeeded)
 	assert.Equal(t, http.StatusAccepted, resp.StatusCode)
 	upgradeOperationID = suite.DecodeOperationID(resp)
-	suite.FinishUpdatingOperationByKIM(upgradeOperationID)
 	suite.WaitForOperationState(upgradeOperationID, domain.Succeeded)
 	runtime = suite.GetRuntimeResourceByInstanceID(id)
 	assert.Equal(t, 14, int(runtime.Spec.Shoot.Provider.Workers[0].Minimum))
@@ -1832,69 +1805,12 @@ func TestUpdateMachineType(t *testing.T) {
 
 	assert.Equal(t, http.StatusAccepted, resp.StatusCode)
 	updateOperationID := suite.DecodeOperationID(resp)
-	suite.FinishUpdatingOperationByKIM(updateOperationID)
 	suite.WaitForOperationState(updateOperationID, domain.Succeeded)
 
 	runtime := suite.GetRuntimeResourceByInstanceID(id)
 	assert.Equal(t, "m5.2xlarge", runtime.Spec.Shoot.Provider.Workers[0].Machine.Type)
 
 }
-
-func TestUpdateBTPOperatorCredsSuccess(t *testing.T) {
-	// given
-	suite := NewBrokerSuiteTest(t)
-	defer suite.TearDown()
-	id := "InstanceID-BTPOperator"
-
-	resp := suite.CallAPI("PUT", fmt.Sprintf("oauth/cf-eu10/v2/service_instances/%s?accepts_incomplete=true&plan_id=7d55d31d-35ae-4438-bf13-6ffdfa107d9f&service_id=47c9dcbf-ff30-448e-ab36-d3bad66ba281", id), `
-{
-	"service_id": "47c9dcbf-ff30-448e-ab36-d3bad66ba281",
-	"plan_id": "7d55d31d-35ae-4438-bf13-6ffdfa107d9f",
-	"context": {
-		"sm_operator_credentials": {
-			"clientid": "cid",
-			"clientsecret": "cs",
-			"url": "url",
-			"sm_url": "sm_url"
-		},
-		"globalaccount_id": "g-account-id",
-		"subaccount_id": "sub-id",
-		"user_id": "[email protected]"
-	},
-	"parameters": {
-		"name": "testing-cluster"
-	}
-}`)
-
-	opID := suite.DecodeOperationID(resp)
-	suite.processKIMProvisioningByOperationID(opID)
-	suite.WaitForOperationState(opID, domain.Succeeded)
-
-	// when
-	resp = suite.CallAPI("PATCH", fmt.Sprintf("oauth/cf-eu10/v2/service_instances/%s?accepts_incomplete=true", id), `
-{
-	"service_id": "47c9dcbf-ff30-448e-ab36-d3bad66ba281",
-	"context": {
-		"globalaccount_id": "g-account-id",
-		"user_id": "[email protected]",
-		"sm_operator_credentials": {
-			"clientid": "testClientID",
-			"clientsecret": "testClientSecret",
-			"sm_url": "https://service-manager.kyma.com",
-			"url": "https://test.auth.com",
-			"xsappname": "testXsappname"
-		}
-	}
-}`)
-
-	assert.Equal(t, http.StatusAccepted, resp.StatusCode)
-	updateOperationID := suite.DecodeOperationID(resp)
-	suite.FinishUpdatingOperationByKIM(updateOperationID)
-	suite.WaitForOperationState(updateOperationID, domain.Succeeded)
-
-	// todo: assert
-}
-
 func TestUpdateNetworkFilterPersisted(t *testing.T) {
 	// given
 	suite := NewBrokerSuiteTest(t, "2.0")
@@ -1957,7 +1873,6 @@ func TestUpdateNetworkFilterPersisted(t *testing.T) {
 	// then
 	assert.Equal(t, http.StatusAccepted, resp.StatusCode)
 	updateOperationID := suite.DecodeOperationID(resp)
-	suite.FinishUpdatingOperationByKIM(updateOperationID)
 	suite.WaitForOperationState(updateOperationID, domain.Succeeded)
 	updateOp, _ := suite.db.Operations().GetOperationByID(updateOperationID)
 	assert.NotNil(suite.t, updateOp.ProvisioningParameters.ErsContext.LicenseType)
@@ -2067,9 +1982,6 @@ func TestMultipleUpdateNetworkFilterPersisted(t *testing.T) {
 	instance := suite.GetInstance(id)
 
 	// then
-	//disabled := false
-	//suite.AssertDisabledNetworkFilterForProvisioning(&disabled)
-	//suite.AssertDisabledNetworkFilterRuntimeState(instance.RuntimeID, opID, &disabled)
 	suite.AssertNetworkFilteringDisabled(instance.InstanceID, false)
 	assert.Nil(suite.t, instance.Parameters.ErsContext.LicenseType)
 
@@ -2085,7 +1997,6 @@ func TestMultipleUpdateNetworkFilterPersisted(t *testing.T) {
 	// then
 	assert.Equal(t, http.StatusAccepted, resp.StatusCode)
 	updateOperationID := suite.DecodeOperationID(resp)
-	suite.FinishUpdatingOperationByKIM(updateOperationID)
 	suite.WaitForOperationState(updateOperationID, domain.Succeeded)
 	instance2 := suite.GetInstance(id)
 	assert.Equal(suite.t, "CUSTOMER", *instance2.Parameters.ErsContext.LicenseType)
@@ -2104,14 +2015,10 @@ func TestMultipleUpdateNetworkFilterPersisted(t *testing.T) {
 	// then
 	assert.Equal(t, http.StatusAccepted, resp.StatusCode)
 	updateOperation2ID := suite.DecodeOperationID(resp)
-	suite.WaitForLastOperation(id, domain.InProgress)
-	suite.FinishUpdatingOperationByKIM(updateOperation2ID)
 	suite.WaitForOperationState(updateOperation2ID, domain.Succeeded)
 	instance3 := suite.GetInstance(id)
 	assert.Equal(suite.t, "CUSTOMER", *instance3.Parameters.ErsContext.LicenseType)
 	suite.AssertNetworkFilteringDisabled(instance.InstanceID, true)
-	//disabled = true
-	//suite.AssertDisabledNetworkFilterRuntimeState(instance.RuntimeID, updateOperation2ID, &disabled)
 }
 
 func TestUpdateOnlyErsContextForExpiredInstance(t *testing.T) {