这是indexloc提供的服务，不要输入任何密码
Skip to content

bug: fixes renaing proxies and sf #190 #194

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
merged 5 commits into from
May 3, 2023
Merged

bug: fixes renaing proxies and sf #190 #194

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
aed6b9e
bug: fixes allversions and shareflow export #190
srinandan Apr 27, 2023
c45f875
bug: fixes reference exports export #190
srinandan Apr 27, 2023
117e5dd
bug: remove warning msgs #190
srinandan Apr 27, 2023
5072420
bug: fixes renaing proxies and sf #190
srinandan Apr 29, 2023
234d123
Merge branch 'main' into issue190
srinandan Apr 29, 2023
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
46 changes: 1 addition & 45 deletions internal/client/apis/apis.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -412,53 +412,9 @@ func exportAPIProxies(wg *sync.WaitGroup, jobs <-chan revision, folder string, e
if !ok {
return
}
u, _ := url.Parse(apiclient.BaseURL)
q := u.Query()
q.Set("format", "bundle")
u.RawQuery = q.Encode()
u.Path = path.Join(u.Path, apiclient.GetApigeeOrg(), "apis", job.name, "revisions", job.rev)

fname := job.name + "_" + job.rev
fd, err := os.CreateTemp("", fname)
if err != nil {
errs <- err
continue
}

err = apiclient.GetHttpClient()
if err != nil {
errs <- err
continue
}
req, err := http.NewRequest(http.MethodGet, u.String(), nil)
err := apiclient.FetchBundle("apis", folder, job.name, job.rev, false)
if err != nil {
errs <- err
continue
}
req, err = apiclient.SetAuthHeader(req)
if err != nil {
errs <- err
continue
}

resp, err := apiclient.ApigeeAPIClient.Do(req)
if err != nil {
errs <- err
continue
}
if _, err = io.Copy(fd, resp.Body); err != nil {
errs <- err
continue
}
_ = fd.Close()

fpath := filepath.Join(folder, fname+".zip")
if err = os.Rename(filepath.Join(fd.Name()), fpath); err != nil {
errs <- err
continue
}
if err = os.Chmod(fpath, 0o644); err != nil {
errs <- err
}
}
}
Expand Down
46 changes: 1 addition & 45 deletions internal/client/sharedflows/sharedflows.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -365,53 +365,9 @@ func exportSharedFlows(wg *sync.WaitGroup, jobs <-chan revision, folder string,
if !ok {
return
}
u, _ := url.Parse(apiclient.BaseURL)
q := u.Query()
q.Set("format", "bundle")
u.RawQuery = q.Encode()
u.Path = path.Join(u.Path, apiclient.GetApigeeOrg(), "sharedflows", job.name, "revisions", job.rev)

fname := job.name + "_" + job.rev
fd, err := os.CreateTemp("", fname)
if err != nil {
errs <- err
continue
}

err = apiclient.GetHttpClient()
if err != nil {
errs <- err
continue
}
req, err := http.NewRequest(http.MethodGet, u.String(), nil)
err := apiclient.FetchBundle("sharedflows", folder, job.name, job.rev, false)
if err != nil {
errs <- err
continue
}
req, err = apiclient.SetAuthHeader(req)
if err != nil {
errs <- err
continue
}

resp, err := apiclient.ApigeeAPIClient.Do(req)
if err != nil {
errs <- err
continue
}
if _, err = io.Copy(fd, resp.Body); err != nil {
errs <- err
continue
}
_ = fd.Close()

fpath := filepath.Join(folder, fname+".zip")
if err = os.Rename(filepath.Join(fd.Name()), fpath); err != nil {
errs <- err
continue
}
if err = os.Chmod(fpath, 0o644); err != nil {
errs <- err
}
}
}
Expand Down