Skip to content

Commit

Permalink
Fix build
Browse files Browse the repository at this point in the history
  • Loading branch information
lblackstone committed Jan 2, 2020
1 parent 50388b7 commit 7a8092d
Show file tree
Hide file tree
Showing 2 changed files with 93 additions and 0 deletions.
56 changes: 56 additions & 0 deletions cmd/pulumi-gen-kubernetes/download.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,56 @@
// Copyright 2016-2020, Pulumi Corporation.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.

package main

import (
"fmt"
"io"
"net/http"
"os"
)

func DownloadFile(filepath string, url string) (err error) {
// If file already exists, skip the download.
if _, err := os.Stat(filepath); err == nil {
return nil
}

// Create the file
out, err := os.Create(filepath)
if err != nil {
return err
}
defer out.Close()

// Get the data
resp, err := http.Get(url)
if err != nil {
return err
}
defer resp.Body.Close()

// Check server response
if resp.StatusCode != http.StatusOK {
return fmt.Errorf("bad status: %s", resp.Status)
}

// Writer the body to file
_, err = io.Copy(out, resp.Body)
if err != nil {
return err
}

return nil
}
37 changes: 37 additions & 0 deletions cmd/pulumi-gen-kubernetes/merge.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
// Copyright 2016-2020, Pulumi Corporation.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.

package main

import (
"encoding/json"

"github.com/RaveNoX/go-jsonmerge"
)

func mergeSwaggerSpecs(legacyBytes, currentBytes []byte) interface{} {

var legacyObj, newObj map[string]interface{}
err := json.Unmarshal(legacyBytes, &legacyObj)
if err != nil {
panic(err)
}
err = json.Unmarshal(currentBytes, &newObj)
if err != nil {
panic(err)
}
merged, _ := jsonmerge.Merge(legacyObj, newObj)

return merged
}

0 comments on commit 7a8092d

Please sign in to comment.