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

bug: fixes issues with archive #307 #308

Merged
merged 1 commit into from
Oct 3, 2023
+36 −36
Merged

bug: fixes issues with archive #307 #308

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
72 changes: 36 additions & 36 deletions internal/bundlegen/proxybundle/proxybundle.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ import (
"golang.org/x/oauth2"
)

var (
const (
proxyRootDir = "apiproxy"
sfRootDir = "sharedflowbundle"
)
Expand All @@ -63,9 +63,9 @@ func GenerateAPIProxyBundleFromOAS(name string,
return err
}

proxyRootDir = path.Join(tmpDir, proxyRootDir)
tmpProxyRootDir := path.Join(tmpDir, proxyRootDir)

if err = os.Mkdir(proxyRootDir, os.ModePerm); err != nil {
if err = os.Mkdir(tmpProxyRootDir, os.ModePerm); err != nil {
return err
}

Expand All @@ -74,16 +74,16 @@ func GenerateAPIProxyBundleFromOAS(name string,
return err
}

err = writeXMLData(proxyRootDir+string(os.PathSeparator)+name+".xml", apiProxyData)
err = writeXMLData(tmpProxyRootDir+string(os.PathSeparator)+name+".xml", apiProxyData)
if err != nil {
return err
}

proxiesDirPath := proxyRootDir + string(os.PathSeparator) + "proxies"
policiesDirPath := proxyRootDir + string(os.PathSeparator) + "policies"
targetDirPath := proxyRootDir + string(os.PathSeparator) + "targets"
resDirPath := proxyRootDir + string(os.PathSeparator) + "resources" + string(os.PathSeparator) + resourceType //"oas"
integrationDirPath := proxyRootDir + string(os.PathSeparator) + "integration-endpoints"
proxiesDirPath := tmpProxyRootDir + string(os.PathSeparator) + "proxies"
policiesDirPath := tmpProxyRootDir + string(os.PathSeparator) + "policies"
targetDirPath := tmpProxyRootDir + string(os.PathSeparator) + "targets"
resDirPath := tmpProxyRootDir + string(os.PathSeparator) + "resources" + string(os.PathSeparator) + resourceType //"oas"
integrationDirPath := tmpProxyRootDir + string(os.PathSeparator) + "integration-endpoints"

if err = os.Mkdir(proxiesDirPath, os.ModePerm); err != nil {
return err
Expand Down Expand Up @@ -206,11 +206,11 @@ func GenerateAPIProxyBundleFromOAS(name string,
}
}

if err = archiveBundle(proxyRootDir, name+".zip", false); err != nil {
if err = archiveBundle(tmpProxyRootDir, name+".zip", false); err != nil {
return err
}

defer os.RemoveAll(proxyRootDir) // clean up
defer os.RemoveAll(tmpProxyRootDir) // clean up
return nil
}

Expand All @@ -233,9 +233,9 @@ func GenerateAPIProxyBundleFromGQL(name string,
return err
}

proxyRootDir = path.Join(tmpDir, proxyRootDir)
tmpProxyRootDir := path.Join(tmpDir, proxyRootDir)

if err = os.Mkdir(proxyRootDir, os.ModePerm); err != nil {
if err = os.Mkdir(tmpProxyRootDir, os.ModePerm); err != nil {
return err
}

Expand All @@ -244,15 +244,15 @@ func GenerateAPIProxyBundleFromGQL(name string,
return err
}

err = writeXMLData(proxyRootDir+string(os.PathSeparator)+name+".xml", apiProxyData)
err = writeXMLData(tmpProxyRootDir+string(os.PathSeparator)+name+".xml", apiProxyData)
if err != nil {
return err
}

proxiesDirPath := proxyRootDir + string(os.PathSeparator) + "proxies"
policiesDirPath := proxyRootDir + string(os.PathSeparator) + "policies"
targetDirPath := proxyRootDir + string(os.PathSeparator) + "targets"
resDirPath := proxyRootDir + string(os.PathSeparator) + "resources" + string(os.PathSeparator) + resourceType //"graphql"
proxiesDirPath := tmpProxyRootDir + string(os.PathSeparator) + "proxies"
policiesDirPath := tmpProxyRootDir + string(os.PathSeparator) + "policies"
targetDirPath := tmpProxyRootDir + string(os.PathSeparator) + "targets"
resDirPath := tmpProxyRootDir + string(os.PathSeparator) + "resources" + string(os.PathSeparator) + resourceType //"graphql"

if err = os.Mkdir(proxiesDirPath, os.ModePerm); err != nil {
return err
Expand Down Expand Up @@ -324,11 +324,11 @@ func GenerateAPIProxyBundleFromGQL(name string,
}
}

if err = archiveBundle(proxyRootDir, name+".zip", false); err != nil {
if err = archiveBundle(tmpProxyRootDir, name+".zip", false); err != nil {
return err
}

defer os.RemoveAll(proxyRootDir) // clean up
defer os.RemoveAll(tmpProxyRootDir) // clean up
return nil
}

Expand All @@ -340,9 +340,9 @@ func GenerateIntegrationAPIProxyBundle(name string, integration string, apitrigg
return err
}

proxyRootDir = path.Join(tmpDir, proxyRootDir)
tmpProxyRootDir := path.Join(tmpDir, proxyRootDir)

if err = os.Mkdir(proxyRootDir, os.ModePerm); err != nil {
if err = os.Mkdir(tmpProxyRootDir, os.ModePerm); err != nil {
return err
}

Expand All @@ -351,14 +351,14 @@ func GenerateIntegrationAPIProxyBundle(name string, integration string, apitrigg
return err
}

err = writeXMLData(proxyRootDir+string(os.PathSeparator)+name+".xml", apiProxyData)
err = writeXMLData(tmpProxyRootDir+string(os.PathSeparator)+name+".xml", apiProxyData)
if err != nil {
return err
}

proxiesDirPath := proxyRootDir + string(os.PathSeparator) + "proxies"
policiesDirPath := proxyRootDir + string(os.PathSeparator) + "policies"
integrationDirPath := proxyRootDir + string(os.PathSeparator) + "integration-endpoints"
proxiesDirPath := tmpProxyRootDir + string(os.PathSeparator) + "proxies"
policiesDirPath := tmpProxyRootDir + string(os.PathSeparator) + "policies"
integrationDirPath := tmpProxyRootDir + string(os.PathSeparator) + "integration-endpoints"

if err = os.Mkdir(proxiesDirPath, os.ModePerm); err != nil {
return err
Expand Down Expand Up @@ -392,11 +392,11 @@ func GenerateIntegrationAPIProxyBundle(name string, integration string, apitrigg
return err
}

if err = archiveBundle(proxyRootDir, name+".zip", false); err != nil {
if err = archiveBundle(tmpProxyRootDir, name+".zip", false); err != nil {
return err
}

defer os.RemoveAll(proxyRootDir) // clean up
defer os.RemoveAll(tmpProxyRootDir) // clean up
return nil
}

Expand All @@ -411,13 +411,13 @@ func GenerateAPIProxyBundleFromSwagger(name string,
return err
}

proxyRootDir = path.Join(tmpDir, proxyRootDir)
tmpProxyRootDir := path.Join(tmpDir, proxyRootDir)

if name == "" {
name = bundlegen.GetGoogleApiName()
}

if err = os.Mkdir(proxyRootDir, os.ModePerm); err != nil {
if err = os.Mkdir(tmpProxyRootDir, os.ModePerm); err != nil {
return err
}

Expand All @@ -426,14 +426,14 @@ func GenerateAPIProxyBundleFromSwagger(name string,
return err
}

err = writeXMLData(proxyRootDir+string(os.PathSeparator)+name+".xml", apiProxyData)
err = writeXMLData(tmpProxyRootDir+string(os.PathSeparator)+name+".xml", apiProxyData)
if err != nil {
return err
}

proxiesDirPath := proxyRootDir + string(os.PathSeparator) + "proxies"
policiesDirPath := proxyRootDir + string(os.PathSeparator) + "policies"
targetDirPath := proxyRootDir + string(os.PathSeparator) + "targets"
proxiesDirPath := tmpProxyRootDir + string(os.PathSeparator) + "proxies"
policiesDirPath := tmpProxyRootDir + string(os.PathSeparator) + "policies"
targetDirPath := tmpProxyRootDir + string(os.PathSeparator) + "targets"

if err = os.Mkdir(proxiesDirPath, os.ModePerm); err != nil {
return err
Expand Down Expand Up @@ -545,11 +545,11 @@ func GenerateAPIProxyBundleFromSwagger(name string,
}
}

if err = archiveBundle(proxyRootDir, name+".zip", false); err != nil {
if err = archiveBundle(tmpProxyRootDir, name+".zip", false); err != nil {
return err
}

defer os.RemoveAll(proxyRootDir) // clean up
defer os.RemoveAll(tmpProxyRootDir) // clean up

return err
}
Expand Down