Filter unwanted files from template repository whilst initialising

.gitignore

@@ -3,16 +3,16 @@ fastly
 
 # Fastly package format files
 **/fastly.toml
-!pkg/packag/testdata/build/fastly.toml
+!pkg/compute/testdata/build/fastly.toml
 **/Cargo.toml
-!pkg/packag/testdata/build/Cargo.toml
+!pkg/compute/testdata/build/Cargo.toml
 **/Cargo.lock
-!pkg/packag/testdata/build/Cargo.lock
+!pkg/compute/testdata/build/Cargo.lock
 **/*.tar.gz
-!pkg/packag/testdata/deploy/pkg/package.tar.gz
+!pkg/compute/testdata/deploy/pkg/package.tar.gz
 **/bin
 **/src
-!pkg/packag/testdata/build/src
+!pkg/compute/testdata/build/src
 **/target
 
 # Binaries for programs and plugins
@@ -33,4 +33,4 @@ fastly
 
 # Ignore binaries
 build/
-!pkg/packag/testdata/build/
+!pkg/compute/testdata/build/

pkg/compute/compute_test.go

@@ -30,19 +30,81 @@ func TestInit(t *testing.T) {
 		t.Skip("Set TEST_COMPUTE_INIT to run this test")
 	}
 
-	if err := os.Chdir("testdata/init"); err != nil {
-		t.Fatal(err)
-	}
-
 	for _, testcase := range []struct {
-		name       string
-		args       []string
-		wantError  string
-		wantOutput string
+		name             string
+		args             []string
+		wantFiles        []string
+		unwantedFiles    []string
+		wantError        string
+		wantOutput       []string
+		manifestIncludes string
 	}{
-		// TODO(pb): wait until package template repo is public
+		{
+			name:      "unkown repository",
+			args:      []string{"compute", "init", "--from", "https://example.com/template"},
+			wantError: "error fetching package template: repository not found",
+		},
+		{
+			name: "with name",
+			args: []string{"compute", "init", "--name", "test"},
+			wantOutput: []string{
+				"Initializing...",
+				"Fetching package template...",
+				"Updating package manifest..",
+			},
+			manifestIncludes: `name = "test"`,
+		},
+		{
+			name: "with service",
+			args: []string{"compute", "init", "--service-id", "test"},
+			wantOutput: []string{
+				"Initializing...",
+				"Fetching package template...",
+				"Updating package manifest..",
+			},
+			manifestIncludes: `service_id = "test"`,
+		},
+		{
+			name: "default",
+			args: []string{"compute", "init"},
+			wantFiles: []string{
+				"cargo.toml",
+				"fastly.toml",
+				"src/main.rs",
+			},
+			unwantedFiles: []string{
+				"SECURITY.md",
+			},
+			wantOutput: []string{
+				"Initializing...",
+				"Fetching package template...",
+				"Updating package manifest..",
+			},
+		},
 	} {
 		t.Run(testcase.name, func(t *testing.T) {
+			// We're going to chdir to an init environment,
+			// so save the PWD to return to, afterwards.
+			pwd, err := os.Getwd()
+			if err != nil {
+				t.Fatal(err)
+			}
+
+			// Create our init environment in a temp dir.
+			// Defer a call to clean it up.
+			rootdir := makeInitEnvironment(t)
+			defer os.RemoveAll(rootdir)
+
+			t.Logf("Temporary init environment: %s", rootdir)
+
+			// Before running the test, chdir into the init environment.
+			// When we're done, chdir back to our original location.
+			// This is so we can reliably assert file structure.
+			if err := os.Chdir(rootdir); err != nil {
+				t.Fatal(err)
+			}
+			defer os.Chdir(pwd)
+
 			var (
 				args                           = testcase.args
 				env                            = config.Environment{}
@@ -55,9 +117,28 @@ func TestInit(t *testing.T) {
 				buf           bytes.Buffer
 				out           io.Writer = common.NewSyncWriter(&buf)
 			)
-			err := app.Run(args, env, file, appConfigFile, clientFactory, httpClient, versioner, in, out)
+			err = app.Run(args, env, file, appConfigFile, clientFactory, httpClient, versioner, in, out)
 			testutil.AssertErrorContains(t, err, testcase.wantError)
-			testutil.AssertString(t, testcase.wantOutput, buf.String())
+			for _, file := range testcase.wantFiles {
+				if _, err := os.Stat(filepath.Join(rootdir, file)); err != nil {
+					t.Errorf("wanted file %s not found", file)
+				}
+			}
+			for _, file := range testcase.unwantedFiles {
+				if _, err := os.Stat(filepath.Join(rootdir, file)); !errors.Is(err, os.ErrNotExist) {
+					t.Errorf("unwanted file %s found", file)
+				}
+			}
+			for _, s := range testcase.wantOutput {
+				testutil.AssertStringContains(t, buf.String(), s)
+			}
+			if testcase.manifestIncludes != "" {
+				content, err := ioutil.ReadFile(filepath.Join(rootdir, compute.ManifestFilename))
+				if err != nil {
+					t.Fatal(err)
+				}
+				testutil.AssertStringContains(t, string(content), testcase.manifestIncludes)
+			}
 		})
 	}
 }
@@ -626,6 +707,27 @@ func TestUploadPackage(t *testing.T) {
 	}
 }
 
+func makeInitEnvironment(t *testing.T) (rootdir string) {
+	t.Helper()
+
+	p := make([]byte, 8)
+	n, err := rand.Read(p)
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	rootdir = filepath.Join(
+		os.TempDir(),
+		fmt.Sprintf("fastly-build-%x", p[:n]),
+	)
+
+	if err := os.MkdirAll(rootdir, 0700); err != nil {
+		t.Fatal(err)
+	}
+
+	return rootdir
+}
+
 func makeBuildEnvironment(t *testing.T, manifestContent string) (rootdir string) {
 	t.Helper()
 

pkg/compute/init.go

@@ -6,6 +6,7 @@ import (
 	"io"
 	"os"
 	"path/filepath"
+	"regexp"
 	"time"
 
 	"github.com/fastly/cli/pkg/common"
@@ -15,6 +16,13 @@ import (
 	"gopkg.in/src-d/go-git.v4"
 )
 
+const defaultTemplate = "https://github.com/fastly/fastly-template-rust-default"
+
+var (
+	fastlyOrgRegEx            = regexp.MustCompile(`^https:\/\/github\.com\/fastly`)
+	fastlyFileIgnoreListRegEx = regexp.MustCompile(`\.github|LICENSE|SECURITY\.md`)
+)
+
 // InitCommand initializes a Compute@Edge project package on the local machine.
 type InitCommand struct {
 	common.Base
@@ -30,7 +38,7 @@ func NewInitCommand(parent common.Registerer, globals *config.Data) *InitCommand
 	c.Globals = globals
 	c.CmdClause = parent.Command("init", "Initialize a new Compute@Edge package locally")
 	c.CmdClause.Flag("name", "Name of package, defaulting to directory name of the --path destination").Short('n').StringVar(&c.name)
-	c.CmdClause.Flag("from", "Git repository containing package template").Short('f').Default("https://github.com/fastly/fastly-template-rust-default").StringVar(&c.from)
+	c.CmdClause.Flag("from", "Git repository containing package template").Short('f').Default(defaultTemplate).StringVar(&c.from)
 	c.CmdClause.Flag("path", "Destination to write the new package, defaulting to the current directory").Short('p').StringVar(&c.path)
 	c.CmdClause.Flag("service-id", "Optional Fastly service ID written to the package manifest, where this package will be deployed").Short('s').StringVar(&c.serviceID)
 	return &c
@@ -103,6 +111,10 @@ func (c *InitCommand) Exec(in io.Reader, out io.Writer) (err error) {
 		if err != nil {
 			return err
 		}
+		// Filter any files we want to ignore in Fastly-owned templates.
+		if fastlyOrgRegEx.MatchString(c.from) && fastlyFileIgnoreListRegEx.MatchString(rel) {
+			return nil
+		}
 		dst := filepath.Join(c.path, rel)
 		if err := os.MkdirAll(filepath.Dir(dst), 0750); err != nil {
 			return err

pkg/compute/testdata/build/Cargo.toml

@@ -0,0 +1,10 @@
+[package]
+name = "edge-compute-default-rust-template"
+version = "0.1.0"
+authors = ["phamann <patrick@fastly.com>"]
+edition = "2018"
+
+[profile.release]
+debug = true
+
+[dependencies]

pkg/compute/testdata/build/fastly.toml

@@ -0,0 +1,5 @@
+manifest_version = "0.1.0"
+name = "Default Rust template"
+description = "Default package template for Rust based edge compute projects."
+authors = ["phamann <patrick@fastly.com>"]
+language = "rust"

pkg/compute/testdata/build/src/main.rs

@@ -0,0 +1,3 @@
+fn main() {
+    println!("Hello world!")
+}