Merge pull request #33 from kyleishie/ostree-updates

OSTree Plugin Updates

build/mage/build.go

@@ -166,7 +166,6 @@ var binaries = map[string]binaryConfig{
 			"CGO_ENABLED": "1",
 		},
 		excludedPlatforms: map[dagger.Platform]struct{}{
-			"linux/arm64":   {},
 			"linux/s390x":   {},
 			"linux/ppc64le": {},
 			"linux/arm/v6":  {},

internal/plugins/ostree/api.go

@@ -43,6 +43,22 @@ func (p *Plugin) AddRemote(ctx context.Context, repository string, properties *a
 	return p.repositoryManager.Get(ctx, repository).AddRemote(ctx, properties)
 }
 
+func (p *Plugin) UpdateRemote(ctx context.Context, repository string, remoteName string, properties *apiv1.OSTreeRemoteProperties) (err error) {
+	if err := checkRepository(repository); err != nil {
+		return err
+	}
+
+	return p.repositoryManager.Get(ctx, repository).UpdateRemote(ctx, remoteName, properties)
+}
+
+func (p *Plugin) DeleteRemote(ctx context.Context, repository string, remoteName string) (err error) {
+	if err := checkRepository(repository); err != nil {
+		return err
+	}
+
+	return p.repositoryManager.Get(ctx, repository).DeleteRemote(ctx, remoteName)
+}
+
 func (p *Plugin) SyncRepository(ctx context.Context, repository string, properties *apiv1.OSTreeRepositorySyncRequest) (err error) {
 	if err := checkRepository(repository); err != nil {
 		return err

internal/plugins/ostree/pkg/libostree/pull_test.go

@@ -111,6 +111,15 @@ func TestRepo_Pull(t *testing.T) {
 				assert.Error(t, err)
 			})
 
+			t.Run("should create then delete remote", func(t *testing.T) {
+				remoteToDelete := "delete-me"
+				err := repo.AddRemote(remoteToDelete, remoteURL, NoGPGVerify())
+				assert.NoError(t, err)
+
+				err = repo.DeleteRemote(remoteToDelete)
+				assert.NoError(t, err)
+			})
+
 			t.Run("should list remotes", func(t *testing.T) {
 				remotes := repo.ListRemotes()
 				assert.Equal(t, remotes, []string{remoteName})

internal/plugins/ostree/pkg/ostreerepository/api.go

@@ -161,6 +161,60 @@ func (h *Handler) AddRemote(ctx context.Context, remote *apiv1.OSTreeRemotePrope
 	}, SkipPull())
 }
 
+func (h *Handler) UpdateRemote(ctx context.Context, remoteName string, remote *apiv1.OSTreeRemoteProperties) (err error) {
+	// Transition to provisioning state
+	if err := h.setState(StateProvisioning); err != nil {
+		return err
+	}
+	defer h.clearState()
+
+	if !h.checkRepoExists(ctx) {
+		return ctl.Errf("repository does not exist")
+	}
+
+	return h.BeginLocalRepoTransaction(ctx, func(ctx context.Context, repo *libostree.Repo) (bool, error) {
+		// Delete user provided remote
+		if err := repo.DeleteRemote(remoteName); err != nil {
+			// No need to make error pretty, it is already pretty
+			return false, err
+		}
+
+		// Add user provided remote
+		var opts []libostree.Option
+		if remote.NoGPGVerify {
+			opts = append(opts, libostree.NoGPGVerify())
+		}
+		if err := repo.AddRemote(remote.Name, remote.RemoteURL, opts...); err != nil {
+			// No need to make error pretty, it is already pretty
+			return false, err
+		}
+
+		return true, nil
+	}, SkipPull())
+}
+
+func (h *Handler) DeleteRemote(ctx context.Context, remoteName string) (err error) {
+	// Transition to provisioning state
+	if err := h.setState(StateProvisioning); err != nil {
+		return err
+	}
+	defer h.clearState()
+
+	if !h.checkRepoExists(ctx) {
+		return ctl.Errf("repository does not exist")
+	}
+
+	return h.BeginLocalRepoTransaction(ctx, func(ctx context.Context, repo *libostree.Repo) (bool, error) {
+		// Delete user provided remote
+		if err := repo.DeleteRemote(remoteName); err != nil {
+			// No need to make error pretty, it is already pretty
+			return false, err
+		}
+
+		return true, nil
+	}, SkipPull())
+}
+
 func (h *Handler) SyncRepository(_ context.Context, properties *apiv1.OSTreeRepositorySyncRequest) (err error) {
 	// Transition to syncing state
 	if err := h.setState(StateSyncing); err != nil {
@@ -187,7 +241,7 @@ func (h *Handler) SyncRepository(_ context.Context, properties *apiv1.OSTreeRepo
 		ctx, cancel := context.WithTimeout(context.Background(), time.Minute)
 		defer cancel()
 
-		err = h.BeginLocalRepoTransaction(ctx, func(ctx context.Context, repo *libostree.Repo) (bool, error) {
+		err = h.BeginLocalRepoTransaction(ctx, func(ctx context.Context, repo *libostree.Repo) (commit bool, transactionFnErr error) {
 			// Pull the latest changes from the remote.
 			opts := []libostree.Option{
 				libostree.Depth(properties.Depth),
@@ -197,8 +251,33 @@ func (h *Handler) SyncRepository(_ context.Context, properties *apiv1.OSTreeRepo
 				opts = append(opts, libostree.Refs(properties.Refs...))
 			}
 
+			remoteName := properties.Remote
+			if properties.EphemeralRemote != nil {
+				remoteName = properties.EphemeralRemote.Name
+
+				var opts []libostree.Option
+				if properties.EphemeralRemote.NoGPGVerify {
+					opts = append(opts, libostree.NoGPGVerify())
+				}
+
+				if err := repo.AddRemote(properties.EphemeralRemote.Name, properties.EphemeralRemote.RemoteURL, opts...); err != nil {
+					// No need to make error pretty, it is already pretty
+					return false, err
+				}
+
+				defer func() {
+					if transactionFnErr == nil {
+						if err := repo.DeleteRemote(properties.EphemeralRemote.Name); err != nil {
+							h.logger.Error("deleting ephemeral remote", "error", err.Error())
+							commit = false
+							transactionFnErr = err
+						}
+					}
+				}()
+			}
+
 			// pull remote content into local repo
-			if err := repo.Pull(ctx, properties.Remote, opts...); err != nil {
+			if err := repo.Pull(ctx, remoteName, opts...); err != nil {
 				return false, ctl.Errf("pulling ostree repository: %s", err)
 			}
 

pkg/plugins/ostree/api/v1/api.go

@@ -42,8 +42,13 @@ type OSTreeRemoteProperties struct {
 
 type OSTreeRepositorySyncRequest struct {
 	// Remote - The name of the remote to sync.
+	// Remote and EphemeralRemote are mutually exclusive. EphemeralRemote takes precedence.
 	Remote string `json:"remote"`
 
+	// EphemeralRemote - A remote to add to the repository in Beskar for the duration of the sync.
+	// Remote and EphemeralRemote are mutually exclusive. EphemeralRemote takes precedence.
+	EphemeralRemote *OSTreeRemoteProperties `json:"ephemeral_remote"`
+
 	// Refs - The branches/refs to mirror. Leave empty to mirror all branches/refs.
 	Refs []string `json:"refs"`
 
@@ -88,6 +93,16 @@ type OSTree interface {
 	//kun:success statusCode=200
 	AddRemote(ctx context.Context, repository string, properties *OSTreeRemoteProperties) (err error)
 
+	// Updates a remote in the OSTree repository. If it doesn't exist it will be created.
+	//kun:op PUT /repository/remote
+	//kun:success statusCode=200
+	UpdateRemote(ctx context.Context, repository string, remoteName string, properties *OSTreeRemoteProperties) (err error)
+
+	// Delete an existing remote to the OSTree repository.
+	//kun:op DELETE /repository/remote
+	//kun:success statusCode=200
+	DeleteRemote(ctx context.Context, repository string, remoteName string) (err error)
+
 	// Sync an ostree repository with one of the configured remotes.
 	//kun:op POST /repository/sync
 	//kun:success statusCode=202