Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,5 +15,4 @@ jobs:
with:
python-version: '3.x'
- run: git fetch --prune --unshallow --tags
- run: make setup
- run: make check
1 change: 1 addition & 0 deletions CHANGELOG.next.md
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ Thanks, you're awesome :-) -->

* Removing deprecated --oss from generator #1404
* Removing use-cases directory #1405
* Remove Go code generator. #1567

#### Bugfixes

Expand Down
24 changes: 1 addition & 23 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
#
.DEFAULT_GOAL := all
FIND := find . -type f -not -path './build/*' -not -path './.git/*'
FORCE_GO_MODULES := GO111MODULE=on
OPEN_DOCS ?= "--open"
PYTHON := build/ve/bin/python
VERSION := $(shell cat version)
Expand Down Expand Up @@ -36,10 +35,6 @@ check-license-headers:
clean:
rm -rf build generated/elasticsearch/component experimental/generated/elasticsearch/component

# Alias to generate source code for all languages.
.PHONY: codegen
codegen: gocodegen

# Build the asciidoc book.
.PHONY: docs
docs:
Expand All @@ -57,29 +52,17 @@ experimental: ve
.PHONY: fmt
fmt: ve
$(FIND) -name '*.py' -exec build/ve/bin/autopep8 --ignore E402 --in-place --max-line-length 120 {} \;
go get golang.org/x/tools/cmd/goimports
goimports -w -l -local github.com/elastic $(shell $(FIND) -name '*.go')

# Alias to generate everything.
.PHONY: generate
generate: generator codegen
generate: generator
$(PYTHON) --version

# Run the new generator
.PHONY: generator
generator: ve
$(PYTHON) scripts/generator.py --strict --include "${INCLUDE}"

# Generate Go code from the schema.
.PHONY: gocodegen
gocodegen:
find code/go/ecs -name '*.go' -not -name 'doc.go' | xargs rm
cd scripts \
&& $(FORCE_GO_MODULES) go run cmd/gocodegen/gocodegen.go \
-version=$(VERSION) \
-schema=../schemas \
-out=../code/go/ecs

# Check Makefile format.
.PHONY: makelint
makelint: SHELL:=/bin/bash
Expand All @@ -96,11 +79,6 @@ misspell:
.PHONY: reload_docs
reload_docs: generator docs

# Download and setup tooling dependencies.
.PHONY: setup
setup: ve
cd scripts && $(FORCE_GO_MODULES) go mod download

# Run the ECS tests
.PHONY: test
test: ve
Expand Down
6 changes: 0 additions & 6 deletions code/README.md

This file was deleted.

8 changes: 0 additions & 8 deletions code/go/ecs/README.md

This file was deleted.

58 changes: 0 additions & 58 deletions code/go/ecs/agent.go

This file was deleted.

33 changes: 0 additions & 33 deletions code/go/ecs/as.go

This file was deleted.

52 changes: 0 additions & 52 deletions code/go/ecs/base.go

This file was deleted.

103 changes: 0 additions & 103 deletions code/go/ecs/client.go

This file was deleted.

Loading