Fix Failing CI Tests

github/resource_github_team_test.go

@@ -192,17 +192,23 @@ func testAccCheckGithubTeamDestroy(s *terraform.State) error {
 		}
 
 		team, resp, err := conn.Teams.GetTeamByID(context.TODO(), orgId, id)
-		if err == nil {
-			teamId := strconv.FormatInt(*team.ID, 10)
-			if team != nil && teamId == rs.Primary.ID {
-				return fmt.Errorf("Team still exists")
+		if err != nil {
+			if resp.StatusCode != 404 {
+				return err
 			}
 		}
-		if resp.StatusCode != 404 {
-			return err
+
+		var teamID string
+		if team != nil {
+			teamID = strconv.FormatInt(*team.ID, 10)
 		}
+		if teamID == rs.Primary.ID {
+			return fmt.Errorf("Team still exists")
+		}
+
 		return nil
 	}
+
 	return nil
 }
 

github/transport.go

@@ -13,11 +13,17 @@ import (
 )
 
 const (
-	ctxEtag    = "etag"
-	ctxId      = "id"
+	ctxEtag    = ctxEtagType("etag")
+	ctxId      = ctxIdType("id")
 	writeDelay = 1 * time.Second
 )
 
+// ctxIdType is used to avoid collisions between packages using context
+type ctxIdType string
+
+// ctxEtagType is used to avoid collisions between packages using context
+type ctxEtagType string
+
 // etagTransport allows saving API quota by passing previously stored Etag
 // available via context to request headers
 type etagTransport struct {