FH-2448: Fix add auto responding team

provider/functionality_resource.go

@@ -93,11 +93,21 @@ func readResourceFireHydrantFunctionality(ctx context.Context, d *schema.Resourc
 		return diag.Errorf("Error unmarshalling labels for functionality %s: %v", functionalityID, err)
 	}
 
+	description := ""
+	if functionalityResponse.Description != nil {
+		description = *functionalityResponse.Description
+	}
+
+	autoAddRespondingTeam := false
+	if functionalityResponse.AutoAddRespondingTeam != nil {
+		autoAddRespondingTeam = *functionalityResponse.AutoAddRespondingTeam
+	}
+
 	// Gather values from API response
 	attributes := map[string]interface{}{
 		"name":                     *functionalityResponse.Name,
-		"description":              *functionalityResponse.Description,
-		"auto_add_responding_team": *functionalityResponse.AutoAddRespondingTeam,
+		"description":              description,
+		"auto_add_responding_team": autoAddRespondingTeam,
 		"labels":                   labelsMap,
 	}
 

provider/functionality_resource_test.go

@@ -123,6 +123,35 @@ func TestAccFunctionalityResourceImport_allAttributes(t *testing.T) {
 	})
 }
 
+func TestAccFunctionalityResource_withoutAutoAddRespondingTeam(t *testing.T) {
+	rName := acctest.RandStringFromCharSet(10, acctest.CharSetAlphaNum)
+
+	resource.Test(t, resource.TestCase{
+		PreCheck:          func() { testFireHydrantIsSetup(t) },
+		ProviderFactories: sharedProviderFactories(),
+		CheckDestroy:      testAccCheckFunctionalityResourceDestroy(),
+		Steps: []resource.TestStep{
+			{
+				Config: testAccFunctionalityResourceConfig_withoutAutoAddRespondingTeam(rName),
+				Check: resource.ComposeAggregateTestCheckFunc(
+					testAccCheckFunctionalityResourceExistsWithAttributes_withoutAutoAddRespondingTeam("firehydrant_functionality.test_functionality"),
+					resource.TestCheckResourceAttrSet("firehydrant_functionality.test_functionality", "id"),
+					resource.TestCheckResourceAttr(
+						"firehydrant_functionality.test_functionality", "name", fmt.Sprintf("test-functionality-%s", rName)),
+					resource.TestCheckResourceAttr("firehydrant_functionality.test_functionality", "auto_add_responding_team", "false"),
+				),
+			},
+			{
+				Config: testAccFunctionalityResourceConfig_withoutAutoAddRespondingTeam(rName),
+				Check: resource.ComposeAggregateTestCheckFunc(
+					testAccCheckFunctionalityResourceExistsWithAttributes_withoutAutoAddRespondingTeam("firehydrant_functionality.test_functionality"),
+					resource.TestCheckResourceAttr("firehydrant_functionality.test_functionality", "auto_add_responding_team", "false"),
+				),
+			},
+		},
+	})
+}
+
 func testAccCheckFunctionalityResourceExistsWithAttributes_basic(resourceName string) resource.TestCheckFunc {
 	return func(s *terraform.State) error {
 		functionalityResource, ok := s.RootModule().Resources[resourceName]
@@ -199,6 +228,47 @@ func testAccCheckFunctionalityResourceExistsWithAttributes_update(resourceName s
 	}
 }
 
+func testAccCheckFunctionalityResourceExistsWithAttributes_withoutAutoAddRespondingTeam(resourceName string) resource.TestCheckFunc {
+	return func(s *terraform.State) error {
+		functionalityResource, ok := s.RootModule().Resources[resourceName]
+		if !ok {
+			return fmt.Errorf("Not found: %s", resourceName)
+		}
+		if functionalityResource.Primary.ID == "" {
+			return fmt.Errorf("No ID is set")
+		}
+
+		client, err := getAccTestClient()
+		if err != nil {
+			return err
+		}
+
+		// This read operation would have crashed before the fix if AutoAddRespondingTeam was nil
+		functionalityResponse, err := client.Sdk.CatalogEntries.GetFunctionality(context.TODO(), functionalityResource.Primary.ID)
+		if err != nil {
+			return err
+		}
+
+		expected, got := functionalityResource.Primary.Attributes["name"], *functionalityResponse.Name
+		if expected != got {
+			return fmt.Errorf("Unexpected name. Expected: %s, got: %s", expected, got)
+		}
+
+		// Verify that auto_add_responding_team is handled correctly even if nil from API
+		// The fix should default it to false when nil
+		autoAddRespondingTeam := false
+		if functionalityResponse.AutoAddRespondingTeam != nil {
+			autoAddRespondingTeam = *functionalityResponse.AutoAddRespondingTeam
+		}
+		expectedBool, gotBool := functionalityResource.Primary.Attributes["auto_add_responding_team"], fmt.Sprintf("%t", autoAddRespondingTeam)
+		if expectedBool != gotBool {
+			return fmt.Errorf("Unexpected auto_add_responding_team. Expected: %s, got: %s", expectedBool, gotBool)
+		}
+
+		return nil
+	}
+}
+
 func testAccCheckFunctionalityResourceDestroy() resource.TestCheckFunc {
 	return func(s *terraform.State) error {
 		client, err := getAccTestClient()
@@ -277,3 +347,13 @@ resource "firehydrant_functionality" "test_functionality" {
   auto_add_responding_team = true
 }`, rName, rName, rName, rName, rName, rName, rName)
 }
+
+func testAccFunctionalityResourceConfig_withoutAutoAddRespondingTeam(rName string) string {
+	return fmt.Sprintf(`
+resource "firehydrant_functionality" "test_functionality" {
+  name = "test-functionality-%s"
+  labels = {
+    test1 = "test-label1-foo",
+  }
+}`, rName)
+}