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

Jump to bottom

fix: merge-json doesn't merge properly #67

Merged
merged 1 commit into from
Oct 16, 2023
Merged

fix: merge-json doesn't merge properly #67

merged 1 commit into from
Oct 16, 2023

Conversation

johnbieren
Copy link
Collaborator 

[jbieren@jbieren utils]$ echo $json1
{"data":{"foo":"bar"}}
[jbieren@jbieren utils]$ echo $json2
{"data":{"one":"two"}}
[jbieren@jbieren utils]$ echo $json3
{"data":{"one":"three"}}
[jbieren@jbieren utils]$ ./merge-json $json1 $json2
{"data":{"foo":"bar","one":"two"}}
[jbieren@jbieren utils]$ ./merge-json $json2 $json3
{"data":{"one":"three"}}

without the fix, it was like this

[jbieren@jbieren utils]$ ./merge-json $json1 $json2
{"data":{"one":"two"}}

@johnbieren
fix: merge-json doesn't merge properly
e1d2258 
Signed-off-by: Johnny Bieren <jbieren@redhat.com>
@johnbieren johnbieren requested review from a team, theflockers, davidmogar, mmalina, scoheb, kasemAlem, happybhati and Troy876 and removed request for a team October 13, 2023 19:54
@johnbieren johnbieren mentioned this pull request Oct 13, 2023
Merged
mmalina
mmalina approved these changes Oct 16, 2023
View reviewed changes
Copy link
Contributor

@mmalina mmalina left a comment

Choose a reason for hiding this comment

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

Nice!

@johnbieren johnbieren merged commit 970ae76 into konflux-ci:main Oct 16, 2023
5 checks passed
@johnbieren johnbieren deleted the fixmerge branch October 16, 2023 11:59
johnbieren added a commit to johnbieren/release-service-catalog that referenced this pull request Oct 16, 2023
@johnbieren
fix: bump collect-data image for bug fix
5f7bf75 
Bump the image used in the collect-data task to get a bug fix in the
merge-json script
(konflux-ci/release-service-utils#67).
Also removes all references to extraData in the task
and replaces it with data to align with recent API changes.

Signed-off-by: Johnny Bieren <jbieren@redhat.com>
@johnbieren johnbieren mentioned this pull request Oct 16, 2023
Merged
johnbieren added a commit to johnbieren/release-service-catalog that referenced this pull request Oct 17, 2023
@johnbieren
fix: bump collect-data image for bug fix
c425d23 
Bump the image used in the collect-data task to get a bug fix in the
merge-json script
(konflux-ci/release-service-utils#67) and
a change to get-resource util to return {} instead of the empty string
if the json key doesn't exist
(konflux-ci/release-service-utils#68).
Also removes all references to extraData in the task
and replaces it with data to align with recent API changes.

Signed-off-by: Johnny Bieren <jbieren@redhat.com>
johnbieren added a commit to johnbieren/release-service-catalog that referenced this pull request Oct 17, 2023
@johnbieren
fix: bump collect-data image for bug fix
5d83fc2 
Bump the image used in the collect-data task to get a bug fix in the
merge-json script
(konflux-ci/release-service-utils#67) and
a change to get-resource util to return {} instead of the empty string
if the json key doesn't exist
(konflux-ci/release-service-utils#68).
Also removes all references to extraData in the task
and replaces it with data to align with recent API changes.

Signed-off-by: Johnny Bieren <jbieren@redhat.com>
johnbieren added a commit to johnbieren/release-service-catalog that referenced this pull request Oct 17, 2023
@johnbieren
fix: bump collect-data image for bug fix
4ab6b10 
Bump the image used in the collect-data task to get a bug fix in the
merge-json script
(konflux-ci/release-service-utils#67) and
a change to get-resource util to return {} instead of the empty string
if the json key doesn't exist
(konflux-ci/release-service-utils#68).
Also removes all references to extraData in the task
and replaces it with data to align with recent API changes.

Signed-off-by: Johnny Bieren <jbieren@redhat.com>
johnbieren added a commit to johnbieren/release-service-catalog that referenced this pull request Oct 17, 2023
@johnbieren
fix: bump collect-data image for bug fix
9f4634a 
Bump the image used in the collect-data task to get a bug fix in the
merge-json script
(konflux-ci/release-service-utils#67) and
a change to get-resource util to return {} instead of the empty string
if the json key doesn't exist
(konflux-ci/release-service-utils#68).
Also removes all references to extraData in the task
and replaces it with data to align with recent API changes.

Signed-off-by: Johnny Bieren <jbieren@redhat.com>
johnbieren added a commit to johnbieren/release-service-catalog that referenced this pull request Oct 17, 2023
@johnbieren
fix: bump collect-data image for bug fix
58b6cd2 
Bump the image used in the collect-data task to get a bug fix in the
merge-json script
(konflux-ci/release-service-utils#67) and
a change to get-resource util to return {} instead of the empty string
if the json key doesn't exist
(konflux-ci/release-service-utils#68).
Also removes all references to extraData in the task
and replaces it with data to align with recent API changes.

Signed-off-by: Johnny Bieren <jbieren@redhat.com>
johnbieren added a commit to johnbieren/release-service-catalog that referenced this pull request Oct 17, 2023
@johnbieren
fix: bump collect-data image for bug fix
8e3150a 
Bump the image used in the collect-data task to get a bug fix in the
merge-json script
(konflux-ci/release-service-utils#67) and
a change to get-resource util to return {} instead of the empty string
if the json key doesn't exist
(konflux-ci/release-service-utils#68).
Also removes all references to extraData in the task
and replaces it with data to align with recent API changes.

Signed-off-by: Johnny Bieren <jbieren@redhat.com>
johnbieren added a commit to johnbieren/release-service-catalog that referenced this pull request Oct 17, 2023
@johnbieren
fix: bump collect-data image for bug fix
730a61f 
Bump the image used in the collect-data task to get a bug fix in the
merge-json script
(konflux-ci/release-service-utils#67) and
a change to get-resource util to return {} instead of the empty string
if the json key doesn't exist
(konflux-ci/release-service-utils#68).
Also removes all references to extraData in the task
and replaces it with data to align with recent API changes.

Signed-off-by: Johnny Bieren <jbieren@redhat.com>
johnbieren added a commit to konflux-ci/release-service-catalog that referenced this pull request Oct 18, 2023
@johnbieren
fix: bump collect-data image for bug fix (#244)
f6c8fb3 
Bump the image used in the collect-data task to get a bug fix in the
merge-json script
(konflux-ci/release-service-utils#67) and
a change to get-resource util to return {} instead of the empty string
if the json key doesn't exist
(konflux-ci/release-service-utils#68).
Also removes all references to extraData in the task
and replaces it with data to align with recent API changes.

Signed-off-by: Johnny Bieren <jbieren@redhat.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@happybhati happybhati happybhati approved these changes

@scoheb scoheb scoheb approved these changes

@mmalina mmalina mmalina approved these changes

@theflockers theflockers Awaiting requested review from theflockers

@davidmogar davidmogar Awaiting requested review from davidmogar

@kasemAlem kasemAlem Awaiting requested review from kasemAlem

@Troy876 Troy876 Awaiting requested review from Troy876

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@johnbieren @mmalina @scoheb @happybhati