Skip to content
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

Jump to bottom

feat: Remove the sync endpoint in favor of patch project endpoint #431

Merged
merged 2 commits into from
Sep 14, 2024
Merged

feat: Remove the sync endpoint in favor of patch project endpoint #431

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9ac4ee7
Remove the sync endpoint in favor of patch project endpoint
cdelst Sep 14, 2024
b0de9be
update sync command
cdelst Sep 14, 2024
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
5 changes: 3 additions & 2 deletions cmd/dev_server/dev_server.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,12 @@ package dev_server
import (
"fmt"

cmdAnalytics "github.com/launchdarkly/ldcli/cmd/analytics"
"github.com/launchdarkly/ldcli/internal/analytics"
"github.com/spf13/cobra"
"github.com/spf13/viper"

cmdAnalytics "github.com/launchdarkly/ldcli/cmd/analytics"
"github.com/launchdarkly/ldcli/internal/analytics"

"github.com/launchdarkly/ldcli/cmd/cliflags"
resourcecmd "github.com/launchdarkly/ldcli/cmd/resources"
"github.com/launchdarkly/ldcli/internal/dev_server"
Expand Down
14 changes: 9 additions & 5 deletions cmd/dev_server/projects.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,17 +108,21 @@ func NewSyncProjectCmd(client resources.Client) *cobra.Command {

func syncProject(client resources.Client) func(*cobra.Command, []string) error {
return func(cmd *cobra.Command, args []string) error {

path := getDevServerUrl() + "/dev/projects/" + viper.GetString(cliflags.ProjectFlag) + "/sync"
res, err := client.MakeUnauthenticatedRequest(
project := viper.GetString(cliflags.ProjectFlag)
path := fmt.Sprintf("%s/dev/projects/%s", getDevServerUrl(), project)
_, err := client.MakeUnauthenticatedRequest(
"PATCH",
path,
nil,
// An empty body sent to the patch project endpoint = sync project
[]byte("{}"),
)
if err != nil {
return output.NewCmdOutputError(err, viper.GetString(cliflags.OutputFlag))
}
fmt.Fprint(cmd.OutOrStdout(), string(res))
_, err = fmt.Fprintf(cmd.OutOrStdout(), "'%s' project synced successfully\n", project)
if err != nil {
return err
}

return nil
}
Expand Down
14 changes: 1 addition & 13 deletions internal/dev_server/api/api.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,18 +24,6 @@ paths:
items:
type: string
uniqueItems: true
/dev/projects/{projectKey}/sync:
patch:
summary: updates the flag state for the given project and source environment
operationId: patchSyncProject
parameters:
- $ref: "#/components/parameters/projectKey"
- $ref: "#/components/parameters/projectExpand"
responses:
200:
$ref: "#/components/responses/Project"
404:
description: No project found
/dev/projects/{projectKey}:
get:
summary: get the specified project and its configuration for syncing from the LaunchDarkly Service
Expand All @@ -49,7 +37,7 @@ paths:
404:
description: No project found
patch:
summary: updates the project context or sourceEnvironmentKey
summary: updates the project context or sourceEnvironmentKey then syncs. Input an empty body to only force a sync.
operationId: patchProject
parameters:
- $ref: "#/components/parameters/projectKey"
Expand Down
60 changes: 0 additions & 60 deletions internal/dev_server/api/patch_sync_project.go
View file
Open in desktop

This file was deleted.

121 changes: 4 additions & 117 deletions internal/dev_server/api/server.gen.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion internal/dev_server/ui/dist/index.html
View file
Open in desktop

Large diffs are not rendered by default.

5 changes: 2 additions & 3 deletions internal/dev_server/ui/src/Sync.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,10 @@ import { FlagVariation } from './api.ts';

const syncProject = async (selectedProject: string) => {
const res = await fetch(
apiRoute(
`/dev/projects/${selectedProject}/sync?expand=availableVariations`,
),
apiRoute(`/dev/projects/${selectedProject}?expand=availableVariations`),
{
method: 'PATCH',
body: JSON.stringify({}),
},
);

Expand Down
Loading