Skip to content

checking conversions for upstream changes. #150

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
openshift-merge-robot merged 2 commits into from
Oct 29, 2020
Merged

checking conversions for upstream changes. #150

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
2352492
USPTREAM: 94480: fake
deads2k Oct 28, 2020
a3eb1ee
just nerf values and see what happens
deads2k Oct 28, 2020
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
4 changes: 2 additions & 2 deletions pkg/api/serialization_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -528,8 +528,8 @@ func TestSpecificKind(t *testing.T) {
seed := int64(2703387474910584091)
fuzzer := originFuzzer(t, seed)

legacyscheme.Scheme.Log(t)
defer legacyscheme.Scheme.Log(nil)
//legacyscheme.Scheme.Log(t)
//defer legacyscheme.Scheme.Log(nil)

gvk := buildv1.SchemeGroupVersion.WithKind("BinaryBuildRequestOptions")
// TODO: make upstream CodecFactory customizable
Expand Down
8 changes: 4 additions & 4 deletions pkg/image/apis/image/dockerpre012/conversion.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,10 @@ import (

// Convert docker client object to internal object, but only when this package is included
func Convert_dockerpre012_ImagePre_012_to_api_DockerImage(in *dockerpre012.ImagePre012, out *newer.DockerImage, s conversion.Scope) error {
if err := s.Convert(in.Config, &out.Config, conversion.AllowDifferentFieldTypeNames); err != nil {
if err := s.Convert(in.Config, &out.Config); err != nil {
return err
}
if err := s.Convert(&in.ContainerConfig, &out.ContainerConfig, conversion.AllowDifferentFieldTypeNames); err != nil {
if err := s.Convert(&in.ContainerConfig, &out.ContainerConfig); err != nil {
return err
}
out.ID = in.ID
Expand All @@ -29,10 +29,10 @@ func Convert_dockerpre012_ImagePre_012_to_api_DockerImage(in *dockerpre012.Image
return nil
}
func Convert_api_DockerImage_to_dockerpre012_ImagePre_012(in *newer.DockerImage, out *dockerpre012.ImagePre012, s conversion.Scope) error {
if err := s.Convert(&in.Config, &out.Config, conversion.AllowDifferentFieldTypeNames); err != nil {
if err := s.Convert(&in.Config, &out.Config); err != nil {
return err
}
if err := s.Convert(&in.ContainerConfig, &out.ContainerConfig, conversion.AllowDifferentFieldTypeNames); err != nil {
if err := s.Convert(&in.ContainerConfig, &out.ContainerConfig); err != nil {
return err
}
out.ID = in.ID
Expand Down
14 changes: 7 additions & 7 deletions pkg/image/apis/image/v1/conversion.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ func Convert_image_Image_To_v1_Image(in *newer.Image, out *v1.Image, s conversio
if in.Signatures != nil {
out.Signatures = make([]v1.ImageSignature, len(in.Signatures))
for i := range in.Signatures {
if err := s.Convert(&in.Signatures[i], &out.Signatures[i], 0); err != nil {
if err := s.Convert(&in.Signatures[i], &out.Signatures[i]); err != nil {
return err
}
}
Expand Down Expand Up @@ -102,7 +102,7 @@ func Convert_v1_Image_To_image_Image(in *v1.Image, out *newer.Image, s conversio
if err := runtime.DecodeInto(dockerImageCodecs.UniversalDecoder(), in.DockerImageMetadata.Raw, obj); err != nil {
return err
}
if err := s.Convert(obj, &out.DockerImageMetadata, 0); err != nil {
if err := s.Convert(obj, &out.DockerImageMetadata); err != nil {
return err
}
}
Expand All @@ -122,7 +122,7 @@ func Convert_v1_Image_To_image_Image(in *v1.Image, out *newer.Image, s conversio
if in.Signatures != nil {
out.Signatures = make([]newer.ImageSignature, len(in.Signatures))
for i := range in.Signatures {
if err := s.Convert(&in.Signatures[i], &out.Signatures[i], 0); err != nil {
if err := s.Convert(&in.Signatures[i], &out.Signatures[i]); err != nil {
return err
}
}
Expand All @@ -146,7 +146,7 @@ func Convert_v1_ImageStreamSpec_To_image_ImageStreamSpec(in *v1.ImageStreamSpec,
out.LookupPolicy = newer.ImageLookupPolicy{Local: in.LookupPolicy.Local}
out.DockerImageRepository = in.DockerImageRepository
out.Tags = make(map[string]newer.TagReference)
return s.Convert(&in.Tags, &out.Tags, 0)
return s.Convert(&in.Tags, &out.Tags)
}

func Convert_image_ImageStreamSpec_To_v1_ImageStreamSpec(in *newer.ImageStreamSpec, out *v1.ImageStreamSpec, s conversion.Scope) error {
Expand All @@ -162,7 +162,7 @@ func Convert_image_ImageStreamSpec_To_v1_ImageStreamSpec(in *newer.ImageStreamSp
}
}
out.Tags = make([]v1.TagReference, 0, 0)
return s.Convert(&in.Tags, &out.Tags, 0)
return s.Convert(&in.Tags, &out.Tags)
}

func Convert_v1_ImageStreamStatus_To_image_ImageStreamStatus(in *v1.ImageStreamStatus, out *newer.ImageStreamStatus, s conversion.Scope) error {
Expand Down Expand Up @@ -271,7 +271,7 @@ func Convert_image_TagEventListArray_to_v1_NamedTagEventListArray(in *map[string
func Convert_v1_TagReferenceArray_to_api_TagReferenceMap(in *[]v1.TagReference, out *map[string]newer.TagReference, s conversion.Scope) error {
for _, curr := range *in {
r := newer.TagReference{}
if err := s.Convert(&curr, &r, 0); err != nil {
if err := s.Convert(&curr, &r); err != nil {
return err
}
(*out)[curr.Name] = r
Expand All @@ -288,7 +288,7 @@ func Convert_image_TagReferenceMap_to_v1_TagReferenceArray(in *map[string]newer.
for _, tag := range allTags {
newTagReference := (*in)[tag]
oldTagReference := v1.TagReference{}
if err := s.Convert(&newTagReference, &oldTagReference, 0); err != nil {
if err := s.Convert(&newTagReference, &oldTagReference); err != nil {
return err
}
oldTagReference.Name = tag
Expand Down
4 changes: 2 additions & 2 deletions pkg/image/apis/image/v1/zz_generated.conversion.go
View file
Open in desktop

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

Loading