Skip to content

Commit

Permalink
feat: provide a tool to generate examples from code (#618)
Browse files Browse the repository at this point in the history 
* chore: convert pulsar example in executable code

* chore: convert nginx example in executable code

* fix: handle error in tests

* chore: convert redis example in executable code

* chore: convert cockroachDB example in executable code

* chore: simplify including the entire file as example

* chore: bump dependencies in the e2e module

* chore: add a common Make goal for running Go tests

* chore: push go mod goals to the common file

* chore: add gotestsum as tools to the examples

* chore: support running the example files with Make

* chore: use new goal in CI pipelines

* feat: add a tool to bootstrap an example

* chore: extract code generation to a function

* chore: pass the examples dir to the generate function

* chore: pass the examples docs dir to the generate function

* fix: prepend examples dir when creating the examples files

* chore: extract templates to a constant

* chore: save toolsgo under its own package

* chore: add unit tests for the code generation tool

* chore: run unit tests for the examples

* chore: simplify how to compare tasks

* fix: remove useless assertion

Not adding value to the example

* chore: support setting the Docker image for the example

* docs: document the command line flags

* fix: simplify path generation for examples

* fix: remove unused package in template

* fix: use a title for the example in functions

* chore: add comments to functions

* chore: simplify passing the example to the generator

* chore: standardize how the container is cleaned in tests

* fix: use a timeout in pulsar example

* Revert "fix: use a timeout in pulsar example"

This reverts commit 853375f.

* fix: do not termiante pulsar container, as it's controlled by the Reaper

* chore: add tests to verify that the examples are added to the docs

* chore: automatically add examples to mkdocs

* docs: update docs

* chore: run examples in dedicated pipelines each

* chore: add CI pipelines for the examples

* docs: move new tool docs to the website

* docs: link to the examples dir on Github

* fix: update tests

* chore: include generator tests in the main pipeline

* chore: simplify example pipeline removing go build
  • Loading branch information
@mdelapenya
mdelapenya authored Nov 23, 2022
1 parent ebc3dec commit 84832a6
Show file tree
Hide file tree
Showing 54 changed files with 7,892 additions and 493 deletions.
6 changes: 5 additions & 1 deletion .github/workflows/ci.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ jobs:
run: go mod verify

- name: modTidy
run: go mod tidy
run: make tools-tidy

- name: ensure compilation
env:
Expand All @@ -43,6 +43,10 @@ jobs:
if: ${{ matrix.platform == 'ubuntu-latest' }}
run: make -C e2e tools-tidy

- name: Run example generator tests
if: ${{ matrix.platform == 'ubuntu-latest' }}
run: make -C examples test-unit

- name: Run e2e tests
if: ${{ matrix.platform == 'ubuntu-latest' }}
run: make test-e2e
Expand Down
42 changes: 42 additions & 0 deletions .github/workflows/cockroachdb-example.yml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
name: Cockroachdb example pipeline

on: [push, pull_request]

jobs:
test-cockroachdb:
strategy:
matrix:
go-version: [1.18.x, 1.x]
runs-on: "ubuntu-latest"
steps:

- name: Set up Go
uses: actions/setup-go@v3
with:
go-version: ${{ matrix.go-version }}
id: go

- name: Check out code into the Go module directory
uses: actions/checkout@v3

- name: modVerify
working-directory: ./examples/cockroachdb
run: go mod verify

- name: modTidy
working-directory: ./examples/cockroachdb
run: make tools-tidy

- name: gotestsum
working-directory: ./examples/cockroachdb
run: make test-unit

- name: Run checker
run: |
./scripts/check_environment.sh
- name: Test Summary
uses: test-summary/action@4ee9ece4bca777a38f05c8fc578ac2007fe266f7
with:
paths: "**/TEST-cockroachdb*.xml"
if: always()
42 changes: 42 additions & 0 deletions .github/workflows/nginx-example.yml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
name: Nginx example pipeline

on: [push, pull_request]

jobs:
test-nginx:
strategy:
matrix:
go-version: [1.18.x, 1.x]
runs-on: "ubuntu-latest"
steps:

- name: Set up Go
uses: actions/setup-go@v3
with:
go-version: ${{ matrix.go-version }}
id: go

- name: Check out code into the Go module directory
uses: actions/checkout@v3

- name: modVerify
working-directory: ./examples/nginx
run: go mod verify

- name: modTidy
working-directory: ./examples/nginx
run: make tools-tidy

- name: gotestsum
working-directory: ./examples/nginx
run: make test-unit

- name: Run checker
run: |
./scripts/check_environment.sh
- name: Test Summary
uses: test-summary/action@4ee9ece4bca777a38f05c8fc578ac2007fe266f7
with:
paths: "**/TEST-nginx*.xml"
if: always()
42 changes: 42 additions & 0 deletions .github/workflows/pulsar-example.yml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
name: Pulsar example pipeline

on: [push, pull_request]

jobs:
test-pulsar:
strategy:
matrix:
go-version: [1.18.x, 1.x]
runs-on: "ubuntu-latest"
steps:

- name: Set up Go
uses: actions/setup-go@v3
with:
go-version: ${{ matrix.go-version }}
id: go

- name: Check out code into the Go module directory
uses: actions/checkout@v3

- name: modVerify
working-directory: ./examples/pulsar
run: go mod verify

- name: modTidy
working-directory: ./examples/pulsar
run: make tools-tidy

- name: gotestsum
working-directory: ./examples/pulsar
run: make test-unit

- name: Run checker
run: |
./scripts/check_environment.sh
- name: Test Summary
uses: test-summary/action@4ee9ece4bca777a38f05c8fc578ac2007fe266f7
with:
paths: "**/TEST-pulsar*.xml"
if: always()
42 changes: 42 additions & 0 deletions .github/workflows/redis-example.yml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
name: Redis example pipeline

on: [push, pull_request]

jobs:
test-redis:
strategy:
matrix:
go-version: [1.18.x, 1.x]
runs-on: "ubuntu-latest"
steps:

- name: Set up Go
uses: actions/setup-go@v3
with:
go-version: ${{ matrix.go-version }}
id: go

- name: Check out code into the Go module directory
uses: actions/checkout@v3

- name: modVerify
working-directory: ./examples/redis
run: go mod verify

- name: modTidy
working-directory: ./examples/redis
run: make tools-tidy

- name: gotestsum
working-directory: ./examples/redis
run: make test-unit

- name: Run checker
run: |
./scripts/check_environment.sh
- name: Test Summary
uses: test-summary/action@4ee9ece4bca777a38f05c8fc578ac2007fe266f7
with:
paths: "**/TEST-redis*.xml"
if: always()
17 changes: 5 additions & 12 deletions Makefile
View file
Original file line number Diff line number Diff line change
@@ -1,21 +1,14 @@
include ./commons-test.mk

.PHONY: test-all
test-all: tools test-unit test-e2e

.PHONY: test-unit
test-unit:
@echo "Running unit tests..."
go run gotest.tools/gotestsum \
--format short-verbose \
--rerun-fails=5 \
--packages="./..." \
--junitfile TEST-unit.xml

.PHONY: test-e2e
test-e2e:
@echo "Running end-to-end tests..."
make -C e2e test

.PHONY: tools
tools:
go mod download
.PHONY: test-examples
test-examples:
@echo "Running example tests..."
make -C examples test
16 changes: 16 additions & 0 deletions commons-test.mk
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
.PHONY: test-%
test-%:
@echo "Running $* tests..."
go run gotest.tools/gotestsum \
--format short-verbose \
--rerun-fails=5 \
--packages="./..." \
--junitfile TEST-$*.xml

.PHONY: tools
tools:
go mod download

.PHONY: tools-tidy
tools-tidy:
go mod tidy
151 changes: 6 additions & 145 deletions docs/examples/cockroachdb.md
View file
Original file line number Diff line number Diff line change
@@ -1,148 +1,9 @@
# CockroachDB

```go
package main
<!--codeinclude-->
[Creating a CockroachDB container](../../examples/cockroachdb/cockroachdb.go)
<!--/codeinclude-->

import (
"context"
"database/sql"
"fmt"
"testing"
"time"

"github.com/google/go-cmp/cmp"
"github.com/google/uuid"
_ "github.com/jackc/pgx/v4/stdlib"
"github.com/testcontainers/testcontainers-go"
"github.com/testcontainers/testcontainers-go/wait"
)

// Task represents a unit of work to complete. We're going to be using this in
// our example as a way to organize data that is being manipulated in
// the database.
type task struct {
ID string `json:"id"`
Description string `json:"description"`
DateDue *time.Time `json:"date_due,string"`
DateCreated time.Time `json:"date_created,string"`
DateUpdated time.Time `json:"date_updated"`
}

type cockroachDBContainer struct {
testcontainers.Container
URI string
}

func setupCockroachDB(ctx context.Context) (*cockroachDBContainer, error) {
req := testcontainers.ContainerRequest{
Image: "cockroachdb/cockroach:latest-v21.1",
ExposedPorts: []string{"26257/tcp", "8080/tcp"},
WaitingFor: wait.ForHTTP("/health").WithPort("8080"),
Cmd: []string{"start-single-node", "--insecure"},
}
container, err := testcontainers.GenericContainer(ctx, testcontainers.GenericContainerRequest{
ContainerRequest: req,
Started: true,
})
if err != nil {
return nil, err
}

mappedPort, err := container.MappedPort(ctx, "26257")
if err != nil {
return nil, err
}

hostIP, err := container.Host(ctx)
if err != nil {
return nil, err
}

uri := fmt.Sprintf("postgres://root@%s:%s", hostIP, mappedPort.Port())

return &cockroachDBContainer{Container: container, URI: uri}, nil
}

func initCockroachDB(ctx context.Context, db sql.DB) error {
// Actual SQL for initializing the database should probably live elsewhere
const query = `CREATE DATABASE projectmanagement;
CREATE TABLE projectmanagement.task(
id uuid primary key not null,
description varchar(255) not null,
date_due timestamp with time zone,
date_created timestamp with time zone not null,
date_updated timestamp with time zone not null);`
_, err := db.ExecContext(ctx, query)

return err
}

func truncateCockroachDB(ctx context.Context, db sql.DB) error {
const query = `TRUNCATE projectmanagement.task`
_, err := db.ExecContext(ctx, query)
return err
}

func TestIntegrationDBInsertSelect(t *testing.T) {
if testing.Short() {
t.Skip("Skipping integration test")
}

ctx := context.Background()

cdbContainer, err := setupCockroachDB(ctx)
if err != nil {
t.Fatal(err)
}
t.Cleanup(func() {
if err := cdbContainer.Terminate(ctx); err != nil {
t.Fatalf("failed to terminate container: %s", err)
}
})

db, err := sql.Open("pgx", cdbContainer.URI+"/projectmanagement")
if err != nil {
t.Fatal(err)
}
defer db.Close()

err = initCockroachDB(ctx, *db)
if err != nil {
t.Fatal(err)
}
defer truncateCockroachDB(ctx, *db)

now := time.Now()

// Insert data
tsk := task{ID: uuid.NewString(), Description: "Update resumé", DateCreated: now, DateUpdated: now}
const insertQuery = `insert into "task" (id, description, date_due, date_created, date_updated)
values ($1, $2, $3, $4, $5)`
_, err = db.ExecContext(
ctx,
insertQuery,
tsk.ID,
tsk.Description,
tsk.DateDue,
tsk.DateCreated,
tsk.DateUpdated)
if err != nil {
t.Fatal(err)
}

// Select data
savedTsk := task{ID: tsk.ID}
const findQuery = `select description, date_due, date_created, date_updated
from task
where id = $1`
row := db.QueryRowContext(ctx, findQuery, tsk.ID)
err = row.Scan(&savedTsk.Description, &savedTsk.DateDue, &savedTsk.DateCreated, &savedTsk.DateUpdated)
if err != nil {
t.Fatal(err)
}

if !cmp.Equal(tsk, savedTsk) {
t.Fatalf("Saved task is not the same:\n%s", cmp.Diff(tsk, savedTsk))
}
}
```
<!--codeinclude-->
[Test for a CockroachDB container](../../examples/cockroachdb/cockroachdb_test.go)
<!--/codeinclude-->
Loading

0 comments on commit 84832a6

Please sign in to comment.