remove comments

Azure · Apr 21, 2020 · 982f427 · 982f427
1 parent 41b90f6
commit 982f427
Showing 1 changed file with 4 additions and 76 deletions.
diff --git a/controllers/suite_test.go b/controllers/suite_test.go
@@ -73,14 +73,6 @@ func setup() error {
 	resourceGroupName := GenerateTestResourceName("rg-prime")
 	resourcegroupLocation := resourcemanagerconfig.DefaultLocation()
 
-	//eventhubNamespaceName := GenerateTestResourceName("evns-prime")
-	//eventhubName := GenerateTestResourceName("ev-prime")
-	//namespaceLocation := resourcemanagerconfig.DefaultLocation()
-
-	//storageAccountName := GenerateAlphaNumTestResourceName("saprime")
-	//blobContainerName := GenerateTestResourceName("blob-prime")
-	//containerAccessLevel := s.PublicAccessContainer
-
 	keyvaultName := GenerateAlphaNumTestResourceName("kv-prime")
 
 	var timeout time.Duration
@@ -683,26 +675,11 @@ func setup() error {
 		_, _ = resourceGroupManager.CreateGroup(context.Background(), resourceGroupName, resourcegroupLocation)
 	}
 
-	/*
-		log.Println("Creating EHNS:", eventhubNamespaceName)
-		eventHubNSManager := eventHubManagers.EventHubNamespace
-
-		// Create the Eventhub namespace resource
-		_, err = eventHubNSManager.CreateNamespaceAndWait(context.Background(), resourceGroupName, eventhubNamespaceName, namespaceLocation)
-		if err != nil {
-			return err
-		}*/
-
 	tc = TestContext{
-		k8sClient:             k8sClient,
-		secretClient:          secretClient,
-		resourceGroupName:     resourceGroupName,
-		resourceGroupLocation: resourcegroupLocation,
-		//eventhubNamespaceName:   eventhubNamespaceName,
-		//eventhubName:            eventhubName,
-		//namespaceLocation:       namespaceLocation,
-		//storageAccountName:      storageAccountName,
-		//blobContainerName:       blobContainerName,
+		k8sClient:               k8sClient,
+		secretClient:            secretClient,
+		resourceGroupName:       resourceGroupName,
+		resourceGroupLocation:   resourcegroupLocation,
 		keyvaultName:            keyvaultName,
 		eventHubManagers:        eventHubManagers,
 		eventhubClient:          eventhubClient,
@@ -720,55 +697,6 @@ func setup() error {
 		retry:                   time.Second * 3,
 		consumerGroupClient:     consumerGroupClient,
 	}
-	/*
-		var pstate *string
-		finish := time.Now().Add(tc.timeout)
-		for {
-			if finish.Before(time.Now()) {
-				return fmt.Errorf("time out waiting for eventhub namespace")
-			}
-
-			namespace, _ := eventHubManagers.EventHubNamespace.GetNamespace(context.Background(), resourceGroupName, eventhubNamespaceName)
-			pstate = namespace.ProvisioningState
-			if pstate != nil && *pstate == "Succeeded" {
-				break
-			}
-			time.Sleep(tc.retry)
-		}
-
-		log.Println("Creating EH:", eventhubName)
-		// Create the Eventhub resource
-		_, err = eventHubManagers.EventHub.CreateHub(context.Background(), resourceGroupName, eventhubNamespaceName, eventhubName, int32(7), int32(2), nil)
-		if err != nil {
-			return err
-		}
-
-		log.Println("Creating SA:", storageAccountName)
-		// Create the Storage Account and Container
-		_, _, _ = storageAccountManager.CreateStorage(context.Background(), resourceGroupName, storageAccountName, resourcegroupLocation, azurev1alpha1.StorageAccountSku{
-			Name: "Standard_LRS",
-		}, "Storage", map[string]*string{}, "", nil, nil, nil)
-
-		// Storage account needs to be in "Suceeded" state
-		// for container create to succeed
-		finish = time.Now().Add(tc.timeout)
-		for {
-
-			if finish.Before(time.Now()) {
-				return fmt.Errorf("time out waiting for storage account")
-			}
-
-			result, _ := storageAccountManager.GetStorage(context.Background(), resourceGroupName, storageAccountName)
-			if result.ProvisioningState == s.Succeeded {
-				break
-			}
-			time.Sleep(tc.retry)
-		}
-
-		_, err = storageManagers.BlobContainer.CreateBlobContainer(context.Background(), resourceGroupName, storageAccountName, blobContainerName, containerAccessLevel)
-		if err != nil {
-			return err
-		}*/
 
 	log.Println("Creating KV:", keyvaultName)
 	_, err = resourcemanagerkeyvaults.AzureKeyVaultManager.CreateVaultWithAccessPolicies(context.Background(), resourceGroupName, keyvaultName, resourcegroupLocation, resourcemanagerconfig.ClientID())