Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
31 commits
Select commit Hold shift + click to select a range
56321eb
Emit events on resource lifecycle status changes
amochtar Sep 20, 2024
603ccc6
Add events tests, initialize channel on request
amochtar Sep 20, 2024
972284c
Merge branch 'jumppad-labs:main' into lifecycle-events
eveld Jan 28, 2025
839636e
Merge branch 'main' into lifecycle-events
eveld Mar 5, 2025
479ded7
Merge branch 'jumppad-labs:main' into lifecycle-events
eveld Apr 8, 2025
d4fb244
wip migration
eveld Apr 17, 2025
b14dc14
Update HCLConfig to v0.28.0
nicholasjackson Mar 7, 2025
8b91400
only create default network is no network is defined
eveld Mar 8, 2025
2ace0f0
only add default network to image cache if created
eveld Mar 8, 2025
9e96029
Undo default network work until a better implementation is made
eveld Mar 10, 2025
cc9f606
Initial version of HTTP resource
eveld Oct 31, 2023
018b8e1
fix example output
eveld Nov 14, 2023
2ed27c9
Make it work with a local httpbin:
eveld Nov 20, 2023
b7f23ab
Update provider to incorporate changes to hclconfig
eveld Apr 10, 2024
48e5448
Update example to output proper json
eveld Apr 11, 2024
34bacfe
add tests for http resource
eveld Mar 8, 2025
9f8c5af
add validate command to validate configuration
eveld Mar 8, 2025
23cca33
remove unused logger
eveld Mar 8, 2025
9a12465
Add fmt command
eveld Mar 8, 2025
06147f1
add additional example line
eveld Mar 8, 2025
442408a
change the wait command from tail to sh
eveld Mar 8, 2025
b3ddc75
Add resources to k8s cluster
eveld Apr 7, 2025
e8cb852
rename test
eveld Apr 16, 2025
c97a794
Add events tests, initialize channel on request
amochtar Sep 20, 2024
55c3f56
wip migration
eveld Apr 17, 2025
4dd2a95
Merge branch 'lifecycle-events' into erik/wip
eveld Apr 17, 2025
3957a29
Update charm logger
eveld Apr 18, 2025
9ade13e
warn when unable to parse log level
eveld Apr 18, 2025
2c9ad3f
Merge pull request #1 from instruqt/erik/wip
eveld Apr 18, 2025
c291c2f
fix tf resource when there are no vars passed
eveld Apr 22, 2025
38cbbb8
Merge pull request #2 from instruqt/erik/fix-tf-resource
eveld Apr 22, 2025
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
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ dagger_release:
--src=.

generate_mocks:
go install github.com/vektra/mockery/v2@v2.20.0
go install github.com/vektra/mockery/v2@v2.46.0
go generate ./...

install_local:
Expand Down
2 changes: 1 addition & 1 deletion cmd/changelog.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package cmd
import (
"strings"

"github.com/jumppad-labs/jumppad/cmd/changelog"
"github.com/instruqt/jumppad/cmd/changelog"
"github.com/spf13/cobra"
)

Expand Down
2 changes: 1 addition & 1 deletion cmd/changelog/view.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import (
"path"

tea "github.com/charmbracelet/bubbletea"
"github.com/jumppad-labs/jumppad/pkg/utils"
"github.com/instruqt/jumppad/pkg/utils"
"github.com/mattn/go-isatty"
)

Expand Down
2 changes: 1 addition & 1 deletion cmd/check.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package cmd
import (
"fmt"

"github.com/jumppad-labs/jumppad/pkg/clients/system"
"github.com/instruqt/jumppad/pkg/clients/system"
"github.com/spf13/cobra"
)

Expand Down
196 changes: 0 additions & 196 deletions cmd/dev.go

This file was deleted.

8 changes: 4 additions & 4 deletions cmd/down.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,10 @@ import (
"os/signal"
"syscall"

"github.com/jumppad-labs/jumppad/pkg/clients"
"github.com/jumppad-labs/jumppad/pkg/clients/connector"
"github.com/jumppad-labs/jumppad/pkg/clients/logger"
"github.com/jumppad-labs/jumppad/pkg/utils"
"github.com/instruqt/jumppad/pkg/clients"
"github.com/instruqt/jumppad/pkg/clients/connector"
"github.com/instruqt/jumppad/pkg/clients/logger"
"github.com/instruqt/jumppad/pkg/utils"
"github.com/spf13/cobra"
)

Expand Down
2 changes: 1 addition & 1 deletion cmd/env.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ import (
"runtime"
"strings"

"github.com/instruqt/jumppad/pkg/config"
"github.com/jumppad-labs/hclconfig/resources"
"github.com/jumppad-labs/jumppad/pkg/config"
"github.com/spf13/cobra"
)

Expand Down
2 changes: 1 addition & 1 deletion cmd/env_test.bak
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import (
"os"
"testing"

"github.com/jumppad-labs/jumppad/pkg/utils"
"github.com/instruqt/jumppad/pkg/utils"
"github.com/spf13/cobra"
assert "github.com/stretchr/testify/require"
)
Expand Down
2 changes: 1 addition & 1 deletion cmd/format.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import (

"github.com/hashicorp/hcl/v2"
"github.com/hashicorp/hcl/v2/hclwrite"
"github.com/jumppad-labs/jumppad/pkg/utils"
"github.com/instruqt/jumppad/pkg/utils"
"github.com/spf13/cobra"
)

Expand Down
4 changes: 2 additions & 2 deletions cmd/generate_readme.go
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
package cmd

import (
"github.com/instruqt/jumppad/pkg/config/resources/blueprint"
"github.com/instruqt/jumppad/pkg/jumppad"
"github.com/jumppad-labs/hclconfig/resources"
"github.com/jumppad-labs/jumppad/pkg/config/resources/blueprint"
"github.com/jumppad-labs/jumppad/pkg/jumppad"
"github.com/spf13/cobra"
)

Expand Down
16 changes: 8 additions & 8 deletions cmd/log.go
Original file line number Diff line number Diff line change
Expand Up @@ -17,14 +17,14 @@ import (
"github.com/spf13/cobra"

dcontainer "github.com/docker/docker/api/types/container"
"github.com/jumppad-labs/jumppad/pkg/clients/container"
"github.com/jumppad-labs/jumppad/pkg/clients/logger"
"github.com/jumppad-labs/jumppad/pkg/config"
"github.com/jumppad-labs/jumppad/pkg/config/resources/cache"
ct "github.com/jumppad-labs/jumppad/pkg/config/resources/container"
"github.com/jumppad-labs/jumppad/pkg/config/resources/k8s"
"github.com/jumppad-labs/jumppad/pkg/config/resources/nomad"
"github.com/jumppad-labs/jumppad/pkg/utils"
"github.com/instruqt/jumppad/pkg/clients/container"
"github.com/instruqt/jumppad/pkg/clients/logger"
"github.com/instruqt/jumppad/pkg/config"
"github.com/instruqt/jumppad/pkg/config/resources/cache"
ct "github.com/instruqt/jumppad/pkg/config/resources/container"
"github.com/instruqt/jumppad/pkg/config/resources/k8s"
"github.com/instruqt/jumppad/pkg/config/resources/nomad"
"github.com/instruqt/jumppad/pkg/utils"
)

func newLogCmd(dc container.Docker, stdout, stderr io.Writer) *cobra.Command {
Expand Down
6 changes: 3 additions & 3 deletions cmd/log_test.bak
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@ import (
"github.com/stretchr/testify/mock"
"github.com/stretchr/testify/require"

"github.com/jumppad-labs/jumppad/pkg/clients/mocks"
"github.com/jumppad-labs/jumppad/testutils"
"github.com/instruqt/jumppad/pkg/clients/mocks"
"github.com/instruqt/jumppad/testutils"
)

const (
Expand Down Expand Up @@ -272,7 +272,7 @@ var logState = `
],
"volumes": [
{
"source": "/home/nicj/go/src/github.com/jumppad-labs/jumppad/examples/container/consul_config",
"source": "/home/nicj/go/src/github.com/instruqt/jumppad/examples/container/consul_config",
"destination": "/config"
}
],
Expand Down
2 changes: 1 addition & 1 deletion cmd/output.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ import (
"strings"

"github.com/hokaccha/go-prettyjson"
"github.com/instruqt/jumppad/pkg/config"
"github.com/jumppad-labs/hclconfig/resources"
"github.com/jumppad-labs/jumppad/pkg/config"
"github.com/spf13/cobra"
)

Expand Down
8 changes: 4 additions & 4 deletions cmd/plugin_build.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,11 @@ import (
"runtime"
"strings"

"github.com/instruqt/jumppad/pkg/clients"
"github.com/instruqt/jumppad/pkg/config/resources/build"
"github.com/instruqt/jumppad/pkg/utils"
"github.com/jumppad-labs/hclconfig"
"github.com/jumppad-labs/hclconfig/types"
"github.com/jumppad-labs/jumppad/pkg/clients"
"github.com/jumppad-labs/jumppad/pkg/config/resources/build"
"github.com/jumppad-labs/jumppad/pkg/utils"
cp "github.com/otiai10/copy"
"github.com/spf13/cobra"
"golang.org/x/mod/modfile"
Expand Down Expand Up @@ -79,7 +79,7 @@ var pluginCmd = &cobra.Command{
if jumppads[0].(*Jumppad).Version != "" {
version = jumppads[0].(*Jumppad).Version
}
engineClients.Getter.Get("github.com/jumppad-labs/jumppad?ref="+version, src)
engineClients.Getter.Get("github.com/instruqt/jumppad?ref="+version, src)

fmt.Println("Downloaded source to", src)
d, err := os.ReadFile(filepath.Join(src, "go.mod"))
Expand Down
8 changes: 4 additions & 4 deletions cmd/purge.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,10 @@ import (

"github.com/docker/docker/api/types/filters"
dimage "github.com/docker/docker/api/types/image"
"github.com/jumppad-labs/jumppad/pkg/clients/container"
"github.com/jumppad-labs/jumppad/pkg/clients/images"
"github.com/jumppad-labs/jumppad/pkg/clients/logger"
"github.com/jumppad-labs/jumppad/pkg/utils"
"github.com/instruqt/jumppad/pkg/clients/container"
"github.com/instruqt/jumppad/pkg/clients/images"
"github.com/instruqt/jumppad/pkg/clients/logger"
"github.com/instruqt/jumppad/pkg/utils"
"github.com/spf13/cobra"
)

Expand Down
Loading