Skip to content

Commit

Permalink
Merge pull request #22 from marcduiker/develop
Browse files Browse the repository at this point in the history
Develop
  • Loading branch information
marcduiker committed Apr 29, 2019
2 parents 7e98f75 + 68e663a commit aae1da5
Show file tree
Hide file tree
Showing 7 changed files with 22 additions and 12 deletions.
1 change: 0 additions & 1 deletion docs/monitored-sources.md
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@
|Azure|azure-functions-vs-build-sdk|
|Azure|azure-webjobs-sdk|
|Azure|azure-webjobs-sdk-extensions|

|marcduiker|az-func-updates|

## RSS Feeds
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
using System.Threading.Tasks;
using System.Linq;
using System.Threading.Tasks;
using AzureFunctionsUpdates.Models.RepositoryReleases;
using Microsoft.Azure.WebJobs;
using Microsoft.Extensions.Logging;
Expand All @@ -15,13 +16,18 @@ public class GetLatestReleaseFromGitHub
[ActivityTrigger] RepositoryConfiguration repoConfiguration,
ILogger logger)
{
logger.LogInformation($"Started {nameof(GetLatestReleaseFromGitHub)} for { repoConfiguration.RepositoryOwner } { repoConfiguration.RepositoryName }.");
logger.LogInformation($"Started {nameof(GetLatestReleaseFromGitHub)} for " +
$"{ repoConfiguration.RepositoryOwner } " +
$"{ repoConfiguration.RepositoryName }.");

RepositoryRelease repoRelease = new NullRelease(repoConfiguration.RepositoryName);
try
{
var latestRelease = await client.Repository.Release.GetLatest(repoConfiguration.RepositoryOwner, repoConfiguration.RepositoryName);
repoRelease = MapToRepoRelease(repoConfiguration, latestRelease);
var latestRelease = await client.Repository.Release.GetAll(
repoConfiguration.RepositoryOwner,
repoConfiguration.RepositoryName,
new ApiOptions { PageCount = 1, PageSize = 1 });
repoRelease = MapToRepoRelease(repoConfiguration, latestRelease.FirstOrDefault());
}
catch (NotFoundException)
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,9 @@ public class GetLatestReleaseFromHistory
[Table(Configuration.Releases.TableName)] CloudTable table,
ILogger logger)
{
logger.LogInformation($"Started {nameof(GetLatestReleaseFromHistory)} for { repoConfiguration.RepositoryOwner } { repoConfiguration.RepositoryName }.");
logger.LogInformation($"Started {nameof(GetLatestReleaseFromHistory)} for " +
$"{ repoConfiguration.RepositoryOwner } " +
$"{ repoConfiguration.RepositoryName }.");

RepositoryRelease latestKnownRelease = null;
var query = QueryBuilder<RepositoryRelease>.CreateQueryForPartitionKey(repoConfiguration.RepositoryName);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,9 @@ public class SaveLatestRelease
[Table(Configuration.Releases.TableName)]IAsyncCollector<RepositoryRelease> collector,
ILogger logger)
{
logger.LogInformation($"Started {nameof(SaveLatestRelease)} for { repoRelease.RepositoryName} { repoRelease.ReleaseName}.");
logger.LogInformation($"Started {nameof(SaveLatestRelease)} for " +
$"{ repoRelease.RepositoryName} " +
$"{ repoRelease.ReleaseName}.");

try
{
Expand Down
6 changes: 4 additions & 2 deletions src/AzureFunctionsUpdates/Builders/MessageBuilder.cs
Original file line number Diff line number Diff line change
Expand Up @@ -12,11 +12,13 @@ public static UpdateMessage BuildForRelease(RepositoryRelease release)
string firstLine;
if (string.IsNullOrEmpty(release.ReleaseName) || release.ReleaseName == release.TagName)
{
firstLine = $"A new {release.RepositoryName} release, tagged {release.TagName}, is available on GitHub since {release.ReleaseCreatedAt.ToString("D")}.";
firstLine = $"A new {release.RepositoryName} release, tagged {release.TagName}, " +
$"is available on GitHub since {release.ReleaseCreatedAt.ToString("D")}.";
}
else
{
firstLine = $"A new {release.RepositoryName} release, {release.ReleaseName} (tagged {release.TagName}), is available on GitHub since {release.ReleaseCreatedAt.ToString("D")}.";
firstLine = $"A new {release.RepositoryName} release, {release.ReleaseName} (tagged {release.TagName}), " +
$"is available on GitHub since {release.ReleaseCreatedAt.ToString("D")}.";
}

var topic = $"{nameof(RepositoryRelease)}|{release.RepositoryName}";
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,8 @@ public bool IsNewAndShouldBePosted

bool IsWithinTimeWindow()
{
return DateTimeOffset.UtcNow.Subtract(FromGitHub.ReleaseCreatedAt).Days < MaximumNumberOfDaysToPostAboutNewlyFoundRelease;
return DateTimeOffset.UtcNow.Subtract(FromGitHub.ReleaseCreatedAt).Days
< MaximumNumberOfDaysToPostAboutNewlyFoundRelease;
}
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
using AzureFunctionsUpdates.Builders;
using AzureFunctionsUpdates.Models;
using AzureFunctionsUpdates.Models.Publications;
using AzureFunctionsUpdates.Storage;
using Microsoft.Azure.WebJobs;
using Microsoft.Extensions.Logging;
using System;
Expand Down Expand Up @@ -83,7 +82,6 @@ public class PublicationUpdateOrchestration
}
}
}


logger.LogInformation($"Completed {nameof(PublicationUpdateOrchestration)}.");
}
Expand Down

0 comments on commit aae1da5

Please sign in to comment.