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

Implement APIs - Tests #19912

Merged
merged 22 commits into from
Mar 22, 2021
Merged

Implement APIs - Tests #19912

merged 22 commits into from
Mar 22, 2021

Conversation

azabbasi
Copy link
Contributor

No description provided.

@check-enforcer
Copy link

This pull request is protected by Check Enforcer.

What is Check Enforcer?

Check Enforcer helps ensure all pull requests are covered by at least one check-run (typically an Azure Pipeline). When all check-runs associated with this pull request pass then Check Enforcer itself will pass.

Why am I getting this message?

You are getting this message because Check Enforcer did not detect any check-runs being associated with this pull request within five minutes. This may indicate that your pull request is not covered by any pipelines and so Check Enforcer is correctly blocking the pull request being merged.

What should I do now?

If the check-enforcer check-run is not passing and all other check-runs associated with this PR are passing (excluding license-cla) then you could try telling Check Enforcer to evaluate your pull request again. You can do this by adding a comment to this pull request as follows:
/check-enforcer evaluate
Typically evaulation only takes a few seconds. If you know that your pull request is not covered by a pipeline and this is expected you can override Check Enforcer using the following command:
/check-enforcer override
Note that using the override command triggers alerts so that follow-up investigations can occur (PRs still need to be approved as normal).

What if I am onboarding a new service?

Often, new services do not have validation pipelines associated with them, in order to bootstrap pipelines for a new service, you can issue the following command as a pull request comment:
/azp run prepare-pipelines
This will run a pipeline that analyzes the source tree and creates the pipelines necessary to build and validate your pull request. Once the pipeline has been created you can trigger the pipeline using the following comment:
/azp run java - [service] - ci

srnagar
srnagar reviewed Mar 19, 2021
View reviewed changes
...he/src/test/java/com/azure/core/serializer/avro/apache/generatedtestsources/HandOfCards.java Outdated Show resolved Hide resolved
...he/src/test/java/com/azure/core/serializer/avro/apache/generatedtestsources/PlayingCard.java Outdated Show resolved Hide resolved
sdk/modelsrepository/azure-iot-modelsrepository/README.md Show resolved Hide resolved
sdk/modelsrepository/azure-iot-modelsrepository/pom.xml Show resolved Hide resolved
...azure-iot-modelsrepository/src/main/java/com/azure/iot/modelsrepository/DtmiConventions.java Outdated Show resolved Hide resolved
...repository/src/main/java/com/azure/iot/modelsrepository/implementation/FileModelFetcher.java Outdated
Comment on lines 55 to 76
while (work.size() != 0) {
String tryContentPath = work.poll();

Path path = Path.of(new File(tryContentPath).getPath());

logger.info(String.format(StandardStrings.FetchingModelContent, path.toString()));

if (Files.exists(path)) {
try {
return Mono.just(
new FetchResult()
.setDefinition(new String(Files.readAllBytes(path)))
.setPath(tryContentPath));
} catch (IOException e) {
return Mono.error(new AzureException(e));
}
}

logger.error(String.format(StandardStrings.ErrorFetchingModelContent, path.toString()));

fnfError = String.format(StandardStrings.ErrorFetchingModelContent, tryContentPath);
}
Copy link
Member

Choose a reason for hiding this comment

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

This is not async. The method returns async publisher so this should be done asynchronously.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

This just reads stuff off of the file system, can you elaborate how that can be done async?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

fixed.

...repository/src/main/java/com/azure/iot/modelsrepository/implementation/HttpModelFetcher.java Outdated Show resolved Hide resolved
...repository/src/main/java/com/azure/iot/modelsrepository/implementation/HttpModelFetcher.java Outdated
Comment on lines 36 to 57
try {
if (resolutionOption == ModelsDependencyResolution.TRY_FROM_EXPANDED) {
work.add(getPath(dtmi, repositoryUri, true));
}
work.add(getPath(dtmi, repositoryUri, false));
} catch (Exception e) {
return Mono.error(new AzureException(e));
}

String tryContentPath = work.poll();

logger.info(String.format(StandardStrings.FetchingModelContent, tryContentPath));

return evaluatePath(tryContentPath, context)
.onErrorResume(error -> {
if (work.size() != 0) {
return evaluatePath(work.poll(), context);
} else {
return Mono.error(error);
}
})
.map(s -> new FetchResult().setPath(tryContentPath).setDefinition(s));
Copy link
Member

Choose a reason for hiding this comment

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

all of this has to be wrapped in Mono.defer()

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I will have to sync up with you on that.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

fixed.

...repository/src/main/java/com/azure/iot/modelsrepository/implementation/FileModelFetcher.java Outdated Show resolved Hide resolved
...lsrepository/src/main/java/com/azure/iot/modelsrepository/implementation/TempCustomType.java Outdated Show resolved Hide resolved
alzimmermsft
alzimmermsft reviewed Mar 19, 2021
View reviewed changes
...azure-iot-modelsrepository/src/main/java/com/azure/iot/modelsrepository/DtmiConventions.java Outdated Show resolved Hide resolved
...azure-iot-modelsrepository/src/main/java/com/azure/iot/modelsrepository/DtmiConventions.java
* @return True if dtmi has a valid format. False otherwise.
*/
public static boolean isValidDtmi(String dtmi) {
if (dtmi == null || dtmi.isEmpty()) {
Copy link
Member

Choose a reason for hiding this comment

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

To go along with null or empty, is there a minimum length requirement for the DTMI being valid that could be used as an early out?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

not that I know of, it has to have at least 3 parts, so I think a minimum length can be inferred

...azure-iot-modelsrepository/src/main/java/com/azure/iot/modelsrepository/DtmiConventions.java Show resolved Hide resolved
...azure-iot-modelsrepository/src/main/java/com/azure/iot/modelsrepository/DtmiConventions.java
}

return dtmi
.toLowerCase(Locale.getDefault())
Copy link
Member

Choose a reason for hiding this comment

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

Is the DTMI going to have different handling per locale or is it going to be ASCII based?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

it will be ASCII based.

...lsrepository/src/main/java/com/azure/iot/modelsrepository/ModelsRepositoryClientBuilder.java Outdated Show resolved Hide resolved
@azabbasi azabbasi merged commit 9bb543a into feature/modelsRepository Mar 22, 2021
@azabbasi azabbasi deleted the feature/dmr/azabbasi/implementation branch March 22, 2021 21:04
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@srnagar srnagar srnagar left review comments

@alzimmermsft alzimmermsft alzimmermsft left review comments

@bikamani bikamani bikamani left review comments

@digimaun digimaun digimaun left review comments

@barustum barustum barustum left review comments

@drwill-ms drwill-ms drwill-ms approved these changes

@abhipsaMisra abhipsaMisra Awaiting requested review from abhipsaMisra

@timtay-microsoft timtay-microsoft Awaiting requested review from timtay-microsoft

@vinagesh vinagesh Awaiting requested review from vinagesh

@anuchandy anuchandy Awaiting requested review from anuchandy

@arerlend arerlend Awaiting requested review from arerlend

@hemanttanwar hemanttanwar Awaiting requested review from hemanttanwar

@jianghaolu jianghaolu Awaiting requested review from jianghaolu

@sjkwak sjkwak Awaiting requested review from sjkwak

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

Successfully merging this pull request may close these issues.
7 participants
@azabbasi @barustum @drwill-ms @digimaun @bikamani @alzimmermsft @srnagar