Skip to content

bumps (library-go) #153

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 7 commits into from
Nov 3, 2020
Merged

bumps (library-go) #153

Show file tree
Hide file tree
Changes from 6 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
72de3fc
pin library-go to v0.0.0-20201102091359-c4fa0f5b3a08
p0lyn0mial Nov 2, 2020
4a9228a
bump (library-go)
p0lyn0mial Nov 2, 2020
1474e8a
fix conversions
p0lyn0mial Nov 2, 2020
30d0edf
pin openshift/api to v0.0.0-20201102162614-9252afb032e1
p0lyn0mial Nov 2, 2020
c6739e5
bump (openshift/api)
p0lyn0mial Nov 2, 2020
ca40e6a
fix openapi
p0lyn0mial Nov 2, 2020
3243401
bring back serizalization test
p0lyn0mial Nov 3, 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
8 changes: 4 additions & 4 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,11 +24,11 @@ require (
github.com/jteeuwen/go-bindata v3.0.8-0.20151023091102-a0ff2567cfb7+incompatible
github.com/opencontainers/go-digest v1.0.0-rc1
github.com/opencontainers/image-spec v1.0.2-0.20190823105129-775207bd45b6
github.com/openshift/api v0.0.0-20200901182017-7ac89ba6b971
github.com/openshift/api v0.0.0-20201102162614-9252afb032e1
github.com/openshift/apiserver-library-go v0.0.0-20200901140731-1236dc23c728
github.com/openshift/build-machinery-go v0.0.0-20200819073603-48aa266c95f7
github.com/openshift/client-go v0.0.0-20200827190008-3062137373b5
github.com/openshift/library-go v0.0.0-20200907120738-ea57b121ba1a
github.com/openshift/build-machinery-go v0.0.0-20200917070002-f171684f77ab
github.com/openshift/client-go v0.0.0-20201020074620-f8fd44879f7c
github.com/openshift/library-go v0.0.0-20201102091359-c4fa0f5b3a08
github.com/spf13/cobra v1.0.0
github.com/spf13/pflag v1.0.5
go.etcd.io/etcd v0.5.0-alpha.5.0.20200819165624-17cef6e3e9d5
Expand Down
70 changes: 29 additions & 41 deletions go.sum
View file
Open in desktop

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions hack/openapi-violation.list
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -210,6 +210,7 @@ API rule violation: list_type_missing,github.com/openshift/api/oauth/v1,OAuthCli
API rule violation: list_type_missing,github.com/openshift/api/oauth/v1,OAuthClient,ScopeRestrictions
API rule violation: list_type_missing,github.com/openshift/api/oauth/v1,OAuthClientAuthorization,Scopes
API rule violation: list_type_missing,github.com/openshift/api/oauth/v1,ScopeRestriction,ExactValues
API rule violation: list_type_missing,github.com/openshift/api/oauth/v1,UserOAuthAccessToken,Scopes

@sttts sttts Nov 3, 2020

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@marun see here. This is a good start. We should not have these violations.

API rule violation: list_type_missing,github.com/openshift/api/openshiftcontrolplane/v1,BuildDefaultsConfig,Env
API rule violation: list_type_missing,github.com/openshift/api/openshiftcontrolplane/v1,BuildDefaultsConfig,ImageLabels
API rule violation: list_type_missing,github.com/openshift/api/openshiftcontrolplane/v1,BuildOverridesConfig,ImageLabels
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); err != nil {
if err := s.Convert(in.Config, &out.Config, conversion.AllowDifferentFieldTypeNames); err != nil {
return err
}
if err := s.Convert(&in.ContainerConfig, &out.ContainerConfig); err != nil {
if err := s.Convert(&in.ContainerConfig, &out.ContainerConfig, conversion.AllowDifferentFieldTypeNames); 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); err != nil {
if err := s.Convert(&in.Config, &out.Config, conversion.AllowDifferentFieldTypeNames); err != nil {
return err
}
if err := s.Convert(&in.ContainerConfig, &out.ContainerConfig); err != nil {
if err := s.Convert(&in.ContainerConfig, &out.ContainerConfig, conversion.AllowDifferentFieldTypeNames); 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]); err != nil {
if err := s.Convert(&in.Signatures[i], &out.Signatures[i], conversion.DestFromSource); 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); err != nil {
if err := s.Convert(obj, &out.DockerImageMetadata, conversion.DestFromSource); 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]); err != nil {
if err := s.Convert(&in.Signatures[i], &out.Signatures[i], conversion.DestFromSource); 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)
return s.Convert(&in.Tags, &out.Tags, conversion.DestFromSource)
}

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)
return s.Convert(&in.Tags, &out.Tags, conversion.DestFromSource)

@sttts sttts Nov 3, 2020

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

what do these mean?

@p0lyn0mial p0lyn0mial Nov 3, 2020 •
edited
Loading

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

these were removed in https://github.com/openshift/openshift-apiserver/pull/150/files#diff-476a993839cca71a75d722226b54f2a2e7560296678290d40054fa9b009bfef3L14

my pr just reverts these changes as they were not meant to be merged.

@p0lyn0mial p0lyn0mial Nov 3, 2020

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

we should revert https://github.com/openshift/openshift-apiserver/pull/150/files#diff-bc324103be9275286883e8cb4282105288549a542d171c6d9abb4910475f5f92L531 as well

@p0lyn0mial p0lyn0mial Nov 3, 2020

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

done.

}

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); err != nil {
if err := s.Convert(&curr, &r, conversion.DestFromSource); 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); err != nil {
if err := s.Convert(&newTagReference, &oldTagReference, conversion.DestFromSource); 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