Clean up and small changes (#58)

* last min cleanup

* python remove

* remove unused

LICENSE.txt

@@ -1,13 +1,93 @@
-Source code in this repository is variously licensed under the Apache License
-Version 2.0, an Apache compatible license, or the Elastic License. Outside of
-the "x-pack" folder, source code in a given file is licensed under the Apache
-License Version 2.0, unless otherwise noted at the beginning of the file or a
-LICENSE file present in the directory subtree declares a separate license.
-Within the "x-pack" folder, source code in a given file is licensed under the
-Elastic License, unless otherwise noted at the beginning of the file or a
-LICENSE file present in the directory subtree declares a separate license.
-
-The build produces two sets of binaries - one set that falls under the Elastic
-License and another set that falls under Apache License Version 2.0. The
-binaries that contain `-oss` in the artifact name are licensed under the Apache
-License Version 2.0.
+Elastic License 2.0
+
+URL: https://www.elastic.co/licensing/elastic-license
+
+## Acceptance
+
+By using the software, you agree to all of the terms and conditions below.
+
+## Copyright License
+
+The licensor grants you a non-exclusive, royalty-free, worldwide,
+non-sublicensable, non-transferable license to use, copy, distribute, make
+available, and prepare derivative works of the software, in each case subject to
+the limitations and conditions below.
+
+## Limitations
+
+You may not provide the software to third parties as a hosted or managed
+service, where the service provides users with access to any substantial set of
+the features or functionality of the software.
+
+You may not move, change, disable, or circumvent the license key functionality
+in the software, and you may not remove or obscure any functionality in the
+software that is protected by the license key.
+
+You may not alter, remove, or obscure any licensing, copyright, or other notices
+of the licensor in the software. Any use of the licensor’s trademarks is subject
+to applicable law.
+
+## Patents
+
+The licensor grants you a license, under any patent claims the licensor can
+license, or becomes able to license, to make, have made, use, sell, offer for
+sale, import and have imported the software, in each case subject to the
+limitations and conditions in this license. This license does not cover any
+patent claims that you cause to be infringed by modifications or additions to
+the software. If you or your company make any written claim that the software
+infringes or contributes to infringement of any patent, your patent license for
+the software granted under these terms ends immediately. If your company makes
+such a claim, your patent license ends immediately for work on behalf of your
+company.
+
+## Notices
+
+You must ensure that anyone who gets a copy of any part of the software from you
+also gets a copy of these terms.
+
+If you modify the software, you must include in any modified copies of the
+software prominent notices stating that you have modified the software.
+
+## No Other Rights
+
+These terms do not imply any licenses other than those expressly granted in
+these terms.
+
+## Termination
+
+If you use the software in violation of these terms, such use is not licensed,
+and your licenses will automatically terminate. If the licensor provides you
+with a notice of your violation, and you cease all violation of this license no
+later than 30 days after you receive that notice, your licenses will be
+reinstated retroactively. However, if you violate these terms after such
+reinstatement, any additional violation of these terms will cause your licenses
+to terminate automatically and permanently.
+
+## No Liability
+
+*As far as the law allows, the software comes as is, without any warranty or
+condition, and the licensor will not be liable to you for any damages arising
+out of these terms or the use or nature of the software, under any kind of
+legal claim.*
+
+## Definitions
+
+The **licensor** is the entity offering these terms, and the **software** is the
+software the licensor makes available under these terms, including any portion
+of it.
+
+**you** refers to the individual or entity agreeing to these terms.
+
+**your company** is any legal entity, sole proprietorship, or other kind of
+organization that you work for, plus all organizations that have control over,
+are under the control of, or are under common control with that
+organization. **control** means ownership of substantially all the assets of an
+entity, or the power to direct its management and policies by vote, contract, or
+otherwise. Control can be direct or indirect.
+
+**your licenses** are all the licenses granted to you for the software under
+these terms.
+
+**use** means anything you do with the software requiring one of your licenses.
+
+**trademark** means trademarks, service marks, and similar rights.

Makefile

@@ -3,13 +3,6 @@ COVERAGE_DIR=$(BUILD_DIR)/coverage
 BEATS?=elastic-agent
 PROJECTS= $(BEATS)
 PYTHON_ENV?=$(BUILD_DIR)/python-env
-PYTHON_EXE?=python3
-PYTHON_ENV_EXE=${PYTHON_ENV}/bin/$(notdir ${PYTHON_EXE})
-VENV_PARAMS?=
-FIND=find . -type f -not -path "*/build/*" -not -path "*/.git/*"
-GOLINT=golint
-GOLINT_REPO=golang.org/x/lint/golint
-XPACK_SUFFIX=''
 MAGE_VERSION     ?= v1.11.0
 MAGE_PRESENT     := $(shell mage --version 2> /dev/null | grep $(MAGE_VERSION))
 MAGE_IMPORT_PATH ?= github.com/magefile/mage
@@ -75,32 +68,6 @@ check-no-changes:
 	@git update-index --refresh
 	@git diff-index --exit-code HEAD --
 
-### Packaging targets ####
-
-## snapshot : Builds a snapshot release.
-.PHONY: snapshot
-snapshot:
-	@$(MAKE) SNAPSHOT=true release
-
-## release : Builds a release.
-.PHONY: release
-release:
-	@mage dumpVariables
-	@$(foreach var,$(BEATS) ,$(MAKE) -C $(var) release || exit 1;)
-	@$(foreach var,$(BEATS), \
-      test -d $(var)/build/distributions && test -n "$$(ls $(var)/build/distributions)" || exit 0; \
-      mkdir -p build/distributions/$(subst $(XPACK_SUFFIX),'',$(var)) && mv -f $(var)/build/distributions/* build/distributions/$(subst $(XPACK_SUFFIX),'',$(var))/ || exit 1;)
-
-## release-manager-snapshot : Builds a snapshot release. The Go version defined in .go-version will be installed and used for the build.
-.PHONY: release-manager-snapshot
-release-manager-snapshot:
-	@$(MAKE) SNAPSHOT=true release-manager-release
-
-## release-manager-release : Builds a snapshot release. The Go version defined in .go-version will be installed and used for the build.
-.PHONY: release-manager-release
-release-manager-release:
-	GO_VERSION=$(shell cat ./.go-version) ./dev-tools/run_with_go_ver $(MAKE) release
-
 ## get-version : Get the libbeat version
 .PHONY: get-version
 get-version:

dev-tools/mage/check.go

@@ -32,7 +32,7 @@ import (
 func Check() error {
 	fmt.Println(">> check: Checking source code for common problems")
 
-	mg.Deps(GoVet, CheckPythonTestNotExecutable, CheckYAMLNotExecutable)
+	mg.Deps(GoVet, CheckYAMLNotExecutable)
 
 	changes, err := GitDiffIndex()
 	if err != nil {
@@ -108,38 +108,6 @@ func GitDiff() error {
 	return err
 }
 
-// CheckPythonTestNotExecutable checks that none of the python test files are
-// executable. They are silently skipped and we don't want this to happen.
-func CheckPythonTestNotExecutable() error {
-	if runtime.GOOS == "windows" {
-		// Skip windows because it doesn't have POSIX permissions.
-		return nil
-	}
-
-	tests, err := FindFiles(pythonTestFiles...)
-	if err != nil {
-		return err
-	}
-
-	var executableTestFiles []string
-	for _, file := range tests {
-		info, err := os.Stat(file)
-		if err != nil {
-			return err
-		}
-
-		if info.Mode().Perm()&0111 > 0 {
-			executableTestFiles = append(executableTestFiles, file)
-		}
-	}
-
-	if len(executableTestFiles) > 0 {
-		return errors.Errorf("python test files cannot be executable because "+
-			"they will be skipped. Fix permissions of %v", executableTestFiles)
-	}
-	return nil
-}
-
 // CheckYAMLNotExecutable checks that no .yml or .yaml files are executable.
 func CheckYAMLNotExecutable() error {
 	if runtime.GOOS == "windows" {

dev-tools/mage/fmt.go

@@ -8,7 +8,6 @@ import (
 	"fmt"
 	"os"
 	"path/filepath"
-	"strings"
 
 	"github.com/magefile/mage/mg"
 	"github.com/magefile/mage/sh"
@@ -34,7 +33,7 @@ func Format() {
 	if BeatProjectType != CommunityProject {
 		mg.Deps(AddLicenseHeaders)
 	}
-	mg.Deps(GoImports, PythonAutopep8)
+	mg.Deps(GoImports)
 }
 
 // GoImports executes goimports against all .go files in and below the CWD.
@@ -64,38 +63,6 @@ func GoImports() error {
 	return sh.RunV("goimports", args...)
 }
 
-// PythonAutopep8 executes autopep8 on all .py files in and below the CWD. It
-// ignores build/ directories.
-func PythonAutopep8() error {
-	pyFiles, err := FindFilesRecursive(func(path string, _ os.FileInfo) bool {
-		return filepath.Ext(path) == ".py" && !strings.Contains(path, "build/")
-	})
-	if err != nil {
-		return err
-	}
-	if len(pyFiles) == 0 {
-		return nil
-	}
-
-	fmt.Println(">> fmt - autopep8: Formatting Python code")
-	ve, err := PythonVirtualenv()
-	if err != nil {
-		return err
-	}
-
-	autopep8, err := LookVirtualenvPath(ve, "autopep8")
-	if err != nil {
-		return err
-	}
-
-	args := append(
-		[]string{"--in-place", "--max-line-length", "120"},
-		pyFiles...,
-	)
-
-	return sh.RunV(autopep8, args...)
-}
-
 // AddLicenseHeaders adds license headers to .go files. It applies the
 // appropriate license header based on the value of devtools.BeatLicense.
 func AddLicenseHeaders() error {

dev-tools/mage/integtest.go

@@ -29,7 +29,6 @@ var (
 		"TEST_COVERAGE",
 		"RACE_DETECTOR",
 		"TEST_TAGS",
-		"PYTHON_EXE",
 		"MODULE",
 		"KUBECONFIG",
 		"KUBE_CONFIG",