Skip to content
This repository has been archived by the owner on Aug 20, 2021. It is now read-only.

Import path #58

Merged
merged 1 commit into from
Jan 24, 2019
Merged

Import path #58

merged 1 commit into from
Jan 24, 2019

Conversation

minhaj10p
Copy link
Contributor

@minhaj10p minhaj10p commented Jan 20, 2019

Description

Addresses #57
In a scenario where oscalkit generate -p /someDir/profile.xml is run, and profile.xml has a relative import like ../catalog.xml, then the directory that will be searched is /someDir

@minhaj10p
Copy link
Contributor Author

@anweiss
#52 to be merged prior

Copy link
Contributor

@asadullah-yousuf-10p asadullah-yousuf-10p left a comment

Choose a reason for hiding this comment

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

Please apply the suggested changes.

generator/manipulation.go Outdated Show resolved Hide resolved
generator/manipulation.go Outdated Show resolved Hide resolved
generator/manipulation.go Outdated Show resolved Hide resolved
generator/manipulation.go Outdated Show resolved Hide resolved
generator/manipulation.go Outdated Show resolved Hide resolved
generator/manipulation.go Outdated Show resolved Hide resolved
generator/mapper.go Outdated Show resolved Hide resolved
generator/mapper.go Outdated Show resolved Hide resolved
generator/mapper.go Outdated Show resolved Hide resolved
generator/profile.go Outdated Show resolved Hide resolved
@anweiss
Copy link
Contributor

anweiss commented Jan 23, 2019

@minhaj10p #62 has been merged. Please rebase. I still need a couple of other reviews on on #52 before we can merge that, and then subsequently this.

@minhaj10p minhaj10p force-pushed the import-path branch 2 times, most recently from 2f97aeb to 1a8bc91 Compare January 23, 2019 20:03
@minhaj10p
Copy link
Contributor Author

@minhaj10p #62 has been merged. Please rebase. I still need a couple of other reviews on on #52 before we can merge that, and then subsequently this.

PRs rebased.

@anweiss
Copy link
Contributor

anweiss commented Jan 24, 2019

@minhaj10p please rebase now that #52 has been merged.

@minhaj10p
Copy link
Contributor Author

@anweiss This PR has been rebased now that #52 is merged

Copy link
Contributor

@anweiss anweiss left a comment

Choose a reason for hiding this comment

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

LGTM

@anweiss anweiss merged commit f32755e into docker-archive:master Jan 24, 2019
@minhaj10p minhaj10p deleted the import-path branch January 24, 2019 18:54
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants