elastic · mergify · Sep 1, 2022
@@ -32,6 +32,7 @@ stages:
                 - "macosTest"
             tags: true         ## for all the tags
         stage: extended
+<<<<<<< HEAD
 # TODO: there are windows test failures already reported
 # https://github.com/elastic/beats/issues/23957 and https://github.com/elastic/beats/issues/23958
 # waiting for being fixed.
@@ -75,6 +76,38 @@ stages:
 #        platforms:             ## override default labels in this specific stage.
 #            - "windows-7-32-bit"
 #        stage: extended_win
+=======
+    windows-2022:
+        mage: "mage build test"
+        platforms:             ## override default labels in this specific stage.
+          - "windows-2022"
+        stage: mandatory
+    windows-2019:
+        mage: "mage build test"
+        platforms:             ## override default labels in this specific stage.
+          - "windows-2019"
+        stage: extended_win
+    windows-2016:
+        mage: "mage build test"
+        platforms:             ## override default labels in this specific stage.
+          - "windows-2016"
+        stage: mandatory
+    windows-2012:
+        mage: "mage build test"
+        platforms:             ## override default labels in this specific stage.
+          - "windows-2012-r2"
+        stage: extended_win
+    windows-10:
+        mage: "mage build test"
+        platforms:             ## override default labels in this specific stage.
+          - "windows-10"
+        stage: extended_win
+    windows-8:
+        mage: "mage build test"
+        platforms:             ## override default labels in this specific stage.
+          - "windows-8"
+        stage: extended_win
+>>>>>>> 8552e34a6a (ci: enable windows for testing heartbeat (#32937))
     packaging-linux:
         packaging-linux: "mage package"
         e2e:

@@ -1,6 +1,8 @@
 // Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
 // or more contributor license agreements. Licensed under the Elastic License;
 // you may not use this file except in compliance with the Elastic License.
+//go:build linux || darwin
+// +build linux darwin
 
 package source
 

@@ -1,6 +1,8 @@
 // Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
 // or more contributor license agreements. Licensed under the Elastic License;
 // you may not use this file except in compliance with the Elastic License.
+//go:build linux || darwin
+// +build linux darwin
 
 package source
 

@@ -2,6 +2,9 @@
 // or more contributor license agreements. Licensed under the Elastic License;
 // you may not use this file except in compliance with the Elastic License.
 
+//go:build linux || darwin
+// +build linux darwin
+
 package source
 
 import (

@@ -2,6 +2,9 @@
 // or more contributor license agreements. Licensed under the Elastic License;
 // you may not use this file except in compliance with the Elastic License.
 
+//go:build linux || darwin
+// +build linux darwin
+
 package source
 
 import (

@@ -1,6 +1,8 @@
 // Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
 // or more contributor license agreements. Licensed under the Elastic License;
 // you may not use this file except in compliance with the Elastic License.
+//go:build linux || darwin
+// +build linux darwin
 
 package source
 

@@ -0,0 +1,132 @@
+// Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+// or more contributor license agreements. Licensed under the Elastic License;
+// you may not use this file except in compliance with the Elastic License.
+//go:build linux || darwin
+// +build linux darwin
+
+package source
+
+import (
+	"bytes"
+	"encoding/base64"
+	"encoding/json"
+	"fmt"
+	"io"
+	"io/ioutil"
+	"os"
+	"os/exec"
+	"path/filepath"
+	"regexp"
+	"strings"
+
+	"github.com/elastic/elastic-agent-libs/mapstr"
+)
+
+type ProjectSource struct {
+	Content         string `config:"content" json:"content"`
+	TargetDirectory string
+}
+
+var ErrNoContent = fmt.Errorf("no 'content' value specified for project monitor source")
+
+func (p *ProjectSource) Validate() error {
+	if !regexp.MustCompile(`\S`).MatchString(p.Content) {
+		return ErrNoContent
+	}
+
+	return nil
+}
+
+func (p *ProjectSource) Fetch() error {
+	decodedBytes, err := base64.StdEncoding.DecodeString(p.Content)
+	if err != nil {
+		return err
+	}
+
+	tf, err := ioutil.TempFile(os.TempDir(), "elastic-synthetics-zip-")
+	if err != nil {
+		return fmt.Errorf("could not create tmpfile for project monitor source: %w", err)
+	}
+	defer os.Remove(tf.Name())
+
+	// copy the encoded contents in to a temp file for unzipping later
+	_, err = io.Copy(tf, bytes.NewReader(decodedBytes))
+	if err != nil {
+		return err
+	}
+
+	p.TargetDirectory, err = ioutil.TempDir(os.TempDir(), "elastic-synthetics-unzip-")
+	if err != nil {
+		return fmt.Errorf("could not make temp dir for unzipping project source: %w", err)
+	}
+
+	err = unzip(tf, p.Workdir(), "")
+	if err != nil {
+		p.Close()
+		return err
+	}
+
+	// Offline is not required for project resources as we are only linking
+	// to the globally installed agent, but useful for testing purposes
+	if !Offline() {
+		// set up npm project and ensure synthetics is installed
+		err = setupProjectDir(p.Workdir())
+		if err != nil {
+			return fmt.Errorf("setting up project dir failed: %w", err)
+		}
+	}
+
+	return nil
+}
+
+type PackageJSON struct {
+	Name         string   `json:"name"`
+	Private      bool     `json:"private"`
+	Dependencies mapstr.M `json:"dependencies"`
+}
+
+// setupProjectDir sets ups the required package.json file and
+// links the synthetics dependency to the globally installed one that is
+// baked in to the Heartbeat image to maintain compatibility and
+// allows us to control the synthetics agent version
+func setupProjectDir(workdir string) error {
+	fname, err := exec.LookPath("elastic-synthetics")
+	if err == nil {
+		fname, err = filepath.Abs(fname)
+	}
+	if err != nil {
+		return fmt.Errorf("cannot resolve global synthetics library: %w", err)
+	}
+
+	globalPath := strings.Replace(fname, "bin/elastic-synthetics", "lib/node_modules/@elastic/synthetics", 1)
+	symlinkPath := fmt.Sprintf("file:%s", globalPath)
+	pkgJson := PackageJSON{
+		Name:    "project-journey",
+		Private: true,
+		Dependencies: mapstr.M{
+			"@elastic/synthetics": symlinkPath,
+		},
+	}
+	pkgJsonContent, err := json.MarshalIndent(pkgJson, "", "  ")
+	if err != nil {
+		return err
+	}
+	err = ioutil.WriteFile(filepath.Join(workdir, "package.json"), pkgJsonContent, 0755)
+	if err != nil {
+		return err
+	}
+
+	// setup the project linking to the global synthetics library
+	return runSimpleCommand(exec.Command("npm", "install"), workdir)
+}
+
+func (p *ProjectSource) Workdir() string {
+	return p.TargetDirectory
+}
+
+func (p *ProjectSource) Close() error {
+	if p.TargetDirectory != "" {
+		return os.RemoveAll(p.TargetDirectory)
+	}
+	return nil
+}
@@ -0,0 +1,100 @@
+// Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+// or more contributor license agreements. Licensed under the Elastic License;
+// you may not use this file except in compliance with the Elastic License.
+//go:build linux || darwin
+// +build linux darwin
+
+package source
+
+import (
+	"os"
+	"path"
+	"testing"
+
+	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/require"
+	"gopkg.in/yaml.v2"
+
+	"github.com/elastic/elastic-agent-libs/config"
+	"github.com/elastic/elastic-agent-libs/mapstr"
+)
+
+func setUpTests() func() {
+	GoOffline()
+	return func() {
+		GoOnline()
+	}
+}
+
+func TestProjectSource(t *testing.T) {
+	teardown := setUpTests()
+	defer teardown()
+
+	type testCase struct {
+		name    string
+		cfg     mapstr.M
+		wantErr bool
+	}
+	testCases := []testCase{
+		{
+			"decode project content",
+			mapstr.M{
+				"content": "UEsDBBQACAAIAJ27qVQAAAAAAAAAAAAAAAAiAAAAZXhhbXBsZXMvdG9kb3MvYWR2YW5jZWQuam91cm5leS50c5VRPW/CMBDd+RWnLA0Sigt0KqJqpbZTN+iEGKzkIC6JbfkuiBTx3+uEEAGlgi7Rnf38viIESCLkR/FJ6Eis1VIjpanATBKrWFCpOUU/kcCNzG2GJNgkhoRM1lLHmERfpnAay4ipo3JrHMMWmjPYwcKZHILn33zBqIV3ADIjkxdrJ4y251eZJFNJq3b1Hh1XJx+KeKK+8XATpxiv3o07RidI7Ex5OOocTEQixcz6mF66MRgGXkmxMhqkTiA2VcJ6NQsgpZcZAnueoAfhFqxcYs9/ncwJdl0YP9XeY6OJgb3qFDcMYwhejb5jsAUDyYxBaSi9HmCJlfZJ2vCYNCpc1h2d5m8AB/r99cU+GmS/hpwXc4nmrKh/K917yK57VqZe1lU6zM26WvIiY2WbHunWIiusb3IWVBP0/bP9NGinYTC/qcqWLloY9ybjNAy5VbzYdP1sdz3+8FqJleqsP7/ONPjjp++TPgS3eaks/wBQSwcIVYIEHGwBAADRAwAAUEsDBBQACAAIAJ27qVQAAAAAAAAAAAAAAAAZAAAAZXhhbXBsZXMvdG9kb3MvaGVscGVycy50c5VUTYvbMBC9768YRGAVyKb0uktCu9CeektvpRCtM4nFKpKQxt2kwf+9I9lJ5cRb6MWW5+u9eTOW3nsXCE4QCf0M8OCxImhhG9wexCc0KpKuPsSjpRr5FMXTXeVsJDBObT57v+I8WID0aoczaIKZwmIJpzvIFaUwqrFVDcp7MQPFdSqQlxAA9aY0QUqe7xw5mQo8saflZ3uGUpvNdxVfh1DEliHWmuOyGSan9GrXY4hdSW19Q1yswJ9Ika1zi28P5DZOZCZnjp2Pjh5lhr71+YAxSvHFEgZx20UqGVdoWGAXGFo0Zp5sD0YnOXX+uMi71TY3nTh2PYy0HZCaYMsm0umrC2cYuWYpStwWlksgPNBC9CKJ9UDqGDFQAv7GrFb6N/aqD0hEtl9pX9VYvQLViroR5KZqFXmlVEXmyDNJWS0wkT1aiqPD6fZPynIsEznoYDqdG7Q7qqcs2DPKzOVG7EyHhSj25n0Zyw62PJvcwH2vzz1PN3czSrifwHlaZfUbThuMFNzxPyj1GVeE/rHWRr2guaz1e6wu0foSmhPTL3DwiuqFshVDu/D4aPSPjz/FIK1n9dwQOfu3gk7pL9k4jK+M5lk0LBRy9CB7nn2yD+cStfuFQQ5+riK9kJQ3JV9cbCmuh1n6HF3h5LleimS7GkoynWVL5+KWS6h/AFBLBwgvDHpj+wEAAC8FAABQSwECLQMUAAgACACdu6lUVYIEHGwBAADRAwAAIgAAAAAAAAAAACAApIEAAAAAZXhhbXBsZXMvdG9kb3MvYWR2YW5jZWQuam91cm5leS50c1BLAQItAxQACAAIAJ27qVQvDHpj+wEAAC8FAAAZAAAAAAAAAAAAIACkgbwBAABleGFtcGxlcy90b2Rvcy9oZWxwZXJzLnRzUEsFBgAAAAACAAIAlwAAAP4DAAAAAA==",
+			},
+			false,
+		},
+		{
+			"bad encoded content",
+			mapstr.M{
+				"content": "12312edasd",
+			},
+			true,
+		},
+	}
+
+	for _, tc := range testCases {
+		t.Run(tc.name, func(t *testing.T) {
+			psrc, err := dummyPSource(tc.cfg)
+			if tc.wantErr {
+				err = psrc.Fetch()
+				require.Error(t, err)
+				return
+			}
+			require.NoError(t, err)
+			fetchAndValidate(t, psrc)
+		})
+	}
+}
+
+func validateFileContents(t *testing.T, dir string) {
+	expected := []string{
+		"examples/todos/helpers.ts",
+		"examples/todos/advanced.journey.ts",
+	}
+	for _, file := range expected {
+		_, err := os.Stat(path.Join(dir, file))
+		assert.NoError(t, err)
+	}
+}
+
+func fetchAndValidate(t *testing.T, psrc *ProjectSource) {
+	err := psrc.Fetch()
+	require.NoError(t, err)
+
+	validateFileContents(t, psrc.Workdir())
+	// check if the working directory is deleted
+	require.NoError(t, psrc.Close())
+	_, err = os.Stat(psrc.TargetDirectory)
+	require.True(t, os.IsNotExist(err), "TargetDirectory %s should have been deleted", psrc.TargetDirectory)
+}
+
+func dummyPSource(conf map[string]interface{}) (*ProjectSource, error) {
+	psrc := &ProjectSource{}
+	y, _ := yaml.Marshal(conf)
+	c, err := config.NewConfigWithYAML(y, string(y))
+	if err != nil {
+		return nil, err
+	}
+	err = c.Unpack(psrc)
+	return psrc, err
+}
@@ -1,6 +1,12 @@
 // Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
 // or more contributor license agreements. Licensed under the Elastic License;
 // you may not use this file except in compliance with the Elastic License.
+<<<<<<< HEAD
+=======
+
+//go:build linux || darwin
+// +build linux darwin
+>>>>>>> 8552e34a6a (ci: enable windows for testing heartbeat (#32937))
 
 package source
 

@@ -2,6 +2,9 @@
 // or more contributor license agreements. Licensed under the Elastic License;
 // you may not use this file except in compliance with the Elastic License.
 
+//go:build linux || darwin
+// +build linux darwin
+
 package source
 
 import (

@@ -2,6 +2,9 @@
 // or more contributor license agreements. Licensed under the Elastic License;
 // you may not use this file except in compliance with the Elastic License.
 
+//go:build linux || darwin
+// +build linux darwin
+
 package source
 
 import (

@@ -2,6 +2,9 @@
 // or more contributor license agreements. Licensed under the Elastic License;
 // you may not use this file except in compliance with the Elastic License.
 
+//go:build linux || darwin
+// +build linux darwin
+
 package source
 
 import (

@@ -2,6 +2,9 @@
 // or more contributor license agreements. Licensed under the Elastic License;
 // you may not use this file except in compliance with the Elastic License.
 
+//go:build linux || darwin
+// +build linux darwin
+
 package source
 
 import (