Skip to content

Update to v2 API (using SDK) #203

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
chrisghill merged 5 commits into from
May 28, 2026
Merged

Update to v2 API (using SDK) #203

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
1472799
Update to v2 API (using SDK)
chrisghill May 28, 2026
817d4aa
go.mod updates
chrisghill May 28, 2026
32a8849
remove dependency on MASSDRIVER_PACKAGE_NAME
chrisghill May 28, 2026
f4b5a45
remove graphql
chrisghill May 28, 2026
8ed18d0
PR findings
chrisghill May 28, 2026
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
169 changes: 0 additions & 169 deletions cmd/artifact.go
View file
Open in desktop

This file was deleted.

11 changes: 5 additions & 6 deletions cmd/bundle.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,7 @@ import (
"xo/src/bundle"
"xo/src/telemetry"

"github.com/massdriver-cloud/massdriver-sdk-go/massdriver/client"
sdkbundle "github.com/massdriver-cloud/massdriver-sdk-go/massdriver/platform/bundle"
"github.com/massdriver-cloud/massdriver-sdk-go/massdriver"
"github.com/rs/zerolog/log"
"github.com/spf13/cobra"
"github.com/spf13/viper"
Expand Down Expand Up @@ -50,12 +49,12 @@ func runBundlePull(cmd *cobra.Command, args []string) error {
return telemetry.LogError(span, fmt.Errorf("required flag bundleVersion must be set via flag or environment variable"), "an error occurred while pulling bundle")
}

mdClient, clientErr := client.New()
if clientErr != nil {
return clientErr
mdClient, err := massdriver.NewClient()
if err != nil {
return fmt.Errorf("error initializing massdriver client: %w", err)
}

repo, repoErr := sdkbundle.GetBundleRepository(mdClient, bundleName)
repo, repoErr := mdClient.OciRepos.Target(bundleName)
if repoErr != nil {
return telemetry.LogError(span, repoErr, "an error occurred while getting bundle repository")
}
Expand Down
9 changes: 4 additions & 5 deletions cmd/deployment.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ import (
"xo/src/deployment"
"xo/src/telemetry"

"github.com/massdriver-cloud/massdriver-sdk-go/massdriver/client"
"github.com/massdriver-cloud/massdriver-sdk-go/massdriver/services/deployments"
"github.com/massdriver-cloud/massdriver-sdk-go/massdriver/provisioning"
"github.com/massdriver-cloud/massdriver-sdk-go/massdriver/provisioning/deployments"
"github.com/rs/zerolog/log"
"github.com/spf13/cobra"
"go.opentelemetry.io/otel"
Expand Down Expand Up @@ -82,13 +82,12 @@ func RunDeploymentStatus(cmd *cobra.Command, args []string) error {
}

log.Info().Msgf("sending deployment status: %s", status)
mdClient, err := client.New()
provClient, err := provisioning.NewClient()
if err != nil {
return telemetry.LogError(span, err, "an error occurred while initializing Massdriver client")
}

service := deployments.NewService(mdClient)
updateErr := deployment.UpdateDeploymentStatus(ctx, service, deploymentID, status)
updateErr := deployment.UpdateDeploymentStatus(ctx, provClient.Deployments, deploymentID, status)
if updateErr != nil {
return telemetry.LogError(span, updateErr, "an error occurred while reporting deployment status")
}
Expand Down
5 changes: 2 additions & 3 deletions cmd/provisioner.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,12 +61,11 @@ func runProvisionerTerraformBackendHTTP(cmd *cobra.Command, args []string) error
return telemetry.LogError(span, specErr, "an error occurred while extracting Massdriver specification")
}

log.Info().Msg("Generating state file...")
log.Info().Msg("Checking for an existing terraform backend configuration...")

generateErr := tf.GenerateBackendHTTPFile(ctx, output, spec, step)
if generateErr != nil {
return telemetry.LogError(span, generateErr, "an error occurred while generating backend file")
return telemetry.LogError(span, generateErr, "an error occurred while generating terraform backend file")
}
log.Info().Msg("State file generated")
return nil
}
Loading
Loading