Skip to content

Commit

Permalink
Merge pull request #4051 from modular-magician/codegen-pr-2069
Browse files Browse the repository at this point in the history
Add project import regex
  • Loading branch information
slevenick authored Jul 17, 2019
2 parents 08b9a5c + cde1fc1 commit 6f825f6
Showing 1 changed file with 12 additions and 0 deletions.
12 changes: 12 additions & 0 deletions google/resource_google_project.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ import (
"fmt"
"log"
"net/http"
"regexp"
"strconv"
"strings"
"time"
Expand Down Expand Up @@ -448,6 +449,17 @@ func resourceGoogleProjectDelete(d *schema.ResourceData, meta interface{}) error
}

func resourceProjectImportState(d *schema.ResourceData, meta interface{}) ([]*schema.ResourceData, error) {
pid := d.Id()
// Prevent importing via project number, this will cause issues later
matched, err := regexp.MatchString("^\\d+$", pid)
if err != nil {
return nil, fmt.Errorf("Error matching project %q: %s", pid, err)
}

if matched {
return nil, fmt.Errorf("Error importing project %q, please use project_id", pid)
}

// Explicitly set to default as a workaround for `ImportStateVerify` tests, and so that users
// don't see a diff immediately after import.
d.Set("auto_create_network", true)
Expand Down

0 comments on commit 6f825f6

Please sign in to comment.