github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-03 09:22:44 +00:00
Code Issues Projects Releases Wiki Activity

mocks must return true in order to trigger err

Browse Source
This commit is contained in:
Ashley Gau 2018-05-25 14:33:33 -07:00
parent 069062365a
commit a96c5f2884
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
pkg/cloudprovider/providers/gce/cloud/mock/mock.go
View File

@ -94,7 +94,7 @@ func RemoveInstanceHook(ctx context.Context, key *meta.Key, req *ga.TargetPoolsR
func convertAndInsertAlphaForwardingRule(key *meta.Key, obj gceObject, mRules map[meta.Key]*cloud.MockForwardingRulesObj, version meta.Version, projectID string) (bool, error) { func convertAndInsertAlphaForwardingRule(key *meta.Key, obj gceObject, mRules map[meta.Key]*cloud.MockForwardingRulesObj, version meta.Version, projectID string) (bool, error) {
if !key.Valid() { if !key.Valid() {
return false, fmt.Errorf("invalid GCE key (%+v)", key) return true, fmt.Errorf("invalid GCE key (%+v)", key)
} }
if _, ok := mRules[*key]; ok { if _, ok := mRules[*key]; ok {
@ -102,16 +102,16 @@ func convertAndInsertAlphaForwardingRule(key *meta.Key, obj gceObject, mRules ma
Code: http.StatusConflict, Code: http.StatusConflict,
Message: fmt.Sprintf("MockForwardingRule %v exists", key), Message: fmt.Sprintf("MockForwardingRule %v exists", key),
} }
return false, err return true, err
} }
enc, err := obj.MarshalJSON() enc, err := obj.MarshalJSON()
if err != nil { if err != nil {
return false, err return true, err
} }
var fwdRule alpha.ForwardingRule var fwdRule alpha.ForwardingRule
if err := json.Unmarshal(enc, &fwdRule); err != nil { if err := json.Unmarshal(enc, &fwdRule); err != nil {
return false, err return true, err
} }
// Set the default values for the Alpha fields. // Set the default values for the Alpha fields.
if fwdRule.NetworkTier == "" { if fwdRule.NetworkTier == "" {
@ -162,7 +162,7 @@ type AddressAttributes struct {
func convertAndInsertAlphaAddress(key *meta.Key, obj gceObject, mAddrs map[meta.Key]*cloud.MockAddressesObj, version meta.Version, projectID string, addressAttrs AddressAttributes) (bool, error) { func convertAndInsertAlphaAddress(key *meta.Key, obj gceObject, mAddrs map[meta.Key]*cloud.MockAddressesObj, version meta.Version, projectID string, addressAttrs AddressAttributes) (bool, error) {
if !key.Valid() { if !key.Valid() {
return false, fmt.Errorf("invalid GCE key (%+v)", key) return true, fmt.Errorf("invalid GCE key (%+v)", key)
} }
if _, ok := mAddrs[*key]; ok { if _, ok := mAddrs[*key]; ok {
@ -170,16 +170,16 @@ func convertAndInsertAlphaAddress(key *meta.Key, obj gceObject, mAddrs map[meta.
Code: http.StatusConflict, Code: http.StatusConflict,
Message: fmt.Sprintf("MockAddresses %v exists", key), Message: fmt.Sprintf("MockAddresses %v exists", key),
} }
return false, err return true, err
} }
enc, err := obj.MarshalJSON() enc, err := obj.MarshalJSON()
if err != nil { if err != nil {
return false, err return true, err
} }
var addr alpha.Address var addr alpha.Address
if err := json.Unmarshal(enc, &addr); err != nil { if err := json.Unmarshal(enc, &addr); err != nil {
return false, err return true, err
} }
// Set default address type if not present. // Set default address type if not present.