Skip to content

[UA update] chore: Update User-Agent string for Lambda Annotations #1731

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.

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
merged 1 commit into from
Apr 16, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<AssemblyVersion>1.3.0</AssemblyVersion>
<AssemblyVersion>1.3.1</AssemblyVersion>
<TargetFramework>netstandard2.0</TargetFramework>

<!-- This is required to allow copying all the dependencies to bin directory which can be copied after to nuget package based on nuspec -->
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ namespace Amazon.Lambda.Annotations.SourceGenerator.Templates
/// Class to produce the template output
/// </summary>

#line 1 "C:\codebase\aws-lambda-dotnet\Libraries\src\Amazon.Lambda.Annotations.SourceGenerator\Templates\LambdaFunctionTemplate.tt"
#line 1 "C:\codebase\V3\HLL\aws-lambda-dotnet\Libraries\src\Amazon.Lambda.Annotations.SourceGenerator\Templates\LambdaFunctionTemplate.tt"
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.TextTemplating", "17.0.0.0")]
public partial class LambdaFunctionTemplate : LambdaFunctionTemplateBase
{
Expand All @@ -35,7 +35,7 @@ public partial class LambdaFunctionTemplate : LambdaFunctionTemplateBase
public virtual string TransformText()
{

#line 12 "C:\codebase\aws-lambda-dotnet\Libraries\src\Amazon.Lambda.Annotations.SourceGenerator\Templates\LambdaFunctionTemplate.tt"
#line 12 "C:\codebase\V3\HLL\aws-lambda-dotnet\Libraries\src\Amazon.Lambda.Annotations.SourceGenerator\Templates\LambdaFunctionTemplate.tt"

foreach (var ns in _model.GeneratedMethod.Usings)
{
Expand All @@ -45,14 +45,14 @@ public virtual string TransformText()
#line hidden
this.Write("using ");

#line 16 "C:\codebase\aws-lambda-dotnet\Libraries\src\Amazon.Lambda.Annotations.SourceGenerator\Templates\LambdaFunctionTemplate.tt"
#line 16 "C:\codebase\V3\HLL\aws-lambda-dotnet\Libraries\src\Amazon.Lambda.Annotations.SourceGenerator\Templates\LambdaFunctionTemplate.tt"
this.Write(this.ToStringHelper.ToStringWithCulture(ns));

#line default
#line hidden
this.Write(";\r\n");

#line 17 "C:\codebase\aws-lambda-dotnet\Libraries\src\Amazon.Lambda.Annotations.SourceGenerator\Templates\LambdaFunctionTemplate.tt"
#line 17 "C:\codebase\V3\HLL\aws-lambda-dotnet\Libraries\src\Amazon.Lambda.Annotations.SourceGenerator\Templates\LambdaFunctionTemplate.tt"

}

Expand All @@ -61,21 +61,21 @@ public virtual string TransformText()
#line hidden
this.Write("\r\nnamespace ");

#line 21 "C:\codebase\aws-lambda-dotnet\Libraries\src\Amazon.Lambda.Annotations.SourceGenerator\Templates\LambdaFunctionTemplate.tt"
#line 21 "C:\codebase\V3\HLL\aws-lambda-dotnet\Libraries\src\Amazon.Lambda.Annotations.SourceGenerator\Templates\LambdaFunctionTemplate.tt"
this.Write(this.ToStringHelper.ToStringWithCulture(_model.LambdaMethod.ContainingNamespace));

#line default
#line hidden
this.Write("\r\n{\r\n public class ");

#line 23 "C:\codebase\aws-lambda-dotnet\Libraries\src\Amazon.Lambda.Annotations.SourceGenerator\Templates\LambdaFunctionTemplate.tt"
#line 23 "C:\codebase\V3\HLL\aws-lambda-dotnet\Libraries\src\Amazon.Lambda.Annotations.SourceGenerator\Templates\LambdaFunctionTemplate.tt"
this.Write(this.ToStringHelper.ToStringWithCulture(_model.GeneratedMethod.ContainingType.Name));

#line default
#line hidden
this.Write("\r\n {\r\n");

#line 25 "C:\codebase\aws-lambda-dotnet\Libraries\src\Amazon.Lambda.Annotations.SourceGenerator\Templates\LambdaFunctionTemplate.tt"
#line 25 "C:\codebase\V3\HLL\aws-lambda-dotnet\Libraries\src\Amazon.Lambda.Annotations.SourceGenerator\Templates\LambdaFunctionTemplate.tt"

this.Write(new FieldsAndConstructor(_model).TransformText());

Expand All @@ -84,34 +84,34 @@ public virtual string TransformText()
#line hidden
this.Write("\r\n\r\n public ");

#line 30 "C:\codebase\aws-lambda-dotnet\Libraries\src\Amazon.Lambda.Annotations.SourceGenerator\Templates\LambdaFunctionTemplate.tt"
#line 30 "C:\codebase\V3\HLL\aws-lambda-dotnet\Libraries\src\Amazon.Lambda.Annotations.SourceGenerator\Templates\LambdaFunctionTemplate.tt"
this.Write(this.ToStringHelper.ToStringWithCulture(_model.LambdaMethod.ReturnsVoidOrGenericTask ? "async " : ""));

#line default
#line hidden

#line 30 "C:\codebase\aws-lambda-dotnet\Libraries\src\Amazon.Lambda.Annotations.SourceGenerator\Templates\LambdaFunctionTemplate.tt"
#line 30 "C:\codebase\V3\HLL\aws-lambda-dotnet\Libraries\src\Amazon.Lambda.Annotations.SourceGenerator\Templates\LambdaFunctionTemplate.tt"
this.Write(this.ToStringHelper.ToStringWithCulture(_model.GeneratedMethod.ReturnType.FullName));

#line default
#line hidden
this.Write(" ");

#line 30 "C:\codebase\aws-lambda-dotnet\Libraries\src\Amazon.Lambda.Annotations.SourceGenerator\Templates\LambdaFunctionTemplate.tt"
#line 30 "C:\codebase\V3\HLL\aws-lambda-dotnet\Libraries\src\Amazon.Lambda.Annotations.SourceGenerator\Templates\LambdaFunctionTemplate.tt"
this.Write(this.ToStringHelper.ToStringWithCulture(_model.LambdaMethod.Name));

#line default
#line hidden
this.Write("(");

#line 30 "C:\codebase\aws-lambda-dotnet\Libraries\src\Amazon.Lambda.Annotations.SourceGenerator\Templates\LambdaFunctionTemplate.tt"
#line 30 "C:\codebase\V3\HLL\aws-lambda-dotnet\Libraries\src\Amazon.Lambda.Annotations.SourceGenerator\Templates\LambdaFunctionTemplate.tt"
this.Write(this.ToStringHelper.ToStringWithCulture(_model.GeneratedMethod.Parameters.Any() ? string.Join(", ", _model.GeneratedMethod.Parameters.Select(p => $"{p.Type.FullName} {p.Name}")) : "Stream stream"));

#line default
#line hidden
this.Write(")\r\n {\r\n");

#line 32 "C:\codebase\aws-lambda-dotnet\Libraries\src\Amazon.Lambda.Annotations.SourceGenerator\Templates\LambdaFunctionTemplate.tt"
#line 32 "C:\codebase\V3\HLL\aws-lambda-dotnet\Libraries\src\Amazon.Lambda.Annotations.SourceGenerator\Templates\LambdaFunctionTemplate.tt"

if (_model.LambdaMethod.UsingDependencyInjection)
{
Expand All @@ -123,28 +123,28 @@ public virtual string TransformText()
"ting scoped dependencies without creating a scope manually.\r\n using v" +
"ar scope = serviceProvider.CreateScope();\r\n var ");

#line 39 "C:\codebase\aws-lambda-dotnet\Libraries\src\Amazon.Lambda.Annotations.SourceGenerator\Templates\LambdaFunctionTemplate.tt"
#line 39 "C:\codebase\V3\HLL\aws-lambda-dotnet\Libraries\src\Amazon.Lambda.Annotations.SourceGenerator\Templates\LambdaFunctionTemplate.tt"
this.Write(this.ToStringHelper.ToStringWithCulture(_model.LambdaMethod.ContainingType.Name.ToCamelCase()));

#line default
#line hidden
this.Write(" = scope.ServiceProvider.GetRequiredService<");

#line 40 "C:\codebase\aws-lambda-dotnet\Libraries\src\Amazon.Lambda.Annotations.SourceGenerator\Templates\LambdaFunctionTemplate.tt"
#line 40 "C:\codebase\V3\HLL\aws-lambda-dotnet\Libraries\src\Amazon.Lambda.Annotations.SourceGenerator\Templates\LambdaFunctionTemplate.tt"
this.Write(this.ToStringHelper.ToStringWithCulture(_model.LambdaMethod.ContainingType.Name));

#line default
#line hidden
this.Write(">();\r\n var serializer = scope.ServiceProvider.GetRequiredService<");

#line 41 "C:\codebase\aws-lambda-dotnet\Libraries\src\Amazon.Lambda.Annotations.SourceGenerator\Templates\LambdaFunctionTemplate.tt"
#line 41 "C:\codebase\V3\HLL\aws-lambda-dotnet\Libraries\src\Amazon.Lambda.Annotations.SourceGenerator\Templates\LambdaFunctionTemplate.tt"
this.Write(this.ToStringHelper.ToStringWithCulture(_model.SerializerInfo.SerializerName));

#line default
#line hidden
this.Write(">();\r\n\r\n");

#line 43 "C:\codebase\aws-lambda-dotnet\Libraries\src\Amazon.Lambda.Annotations.SourceGenerator\Templates\LambdaFunctionTemplate.tt"
#line 43 "C:\codebase\V3\HLL\aws-lambda-dotnet\Libraries\src\Amazon.Lambda.Annotations.SourceGenerator\Templates\LambdaFunctionTemplate.tt"

}

Expand Down Expand Up @@ -176,9 +176,9 @@ private static void SetExecutionEnvironment()
envValue.Append($""{Environment.GetEnvironmentVariable(envName)}_"");
}

envValue.Append(""amazon-lambda-annotations_");
envValue.Append(""lib/amazon-lambda-annotations#");

#line 71 "C:\codebase\aws-lambda-dotnet\Libraries\src\Amazon.Lambda.Annotations.SourceGenerator\Templates\LambdaFunctionTemplate.tt"
#line 71 "C:\codebase\V3\HLL\aws-lambda-dotnet\Libraries\src\Amazon.Lambda.Annotations.SourceGenerator\Templates\LambdaFunctionTemplate.tt"
this.Write(this.ToStringHelper.ToStringWithCulture(_model.SourceGeneratorVersion));

#line default
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ this.Write(new FieldsAndConstructor(_model).TransformText());
envValue.Append($"{Environment.GetEnvironmentVariable(envName)}_");
}

envValue.Append("amazon-lambda-annotations_<#= _model.SourceGeneratorVersion #>");
envValue.Append("lib/amazon-lambda-annotations#<#= _model.SourceGeneratorVersion #>");

Environment.SetEnvironmentVariable(envName, envValue.ToString());
}
Expand Down
2 changes: 1 addition & 1 deletion Libraries/src/Amazon.Lambda.Annotations.nuspec
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
<metadata>
<id>Amazon.Lambda.Annotations</id>
<version>1.3.0</version>
<version>1.3.1</version>
<authors>Amazon Web Services</authors>
<tags>AWS Amazon Lambda</tags>
<description>Annotations that can be added to Lambda projects to generate C# code and CloudFormation templates. This library is currently in dev preview.</description>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<AssemblyVersion>1.3.0</AssemblyVersion>
<AssemblyVersion>1.3.1</AssemblyVersion>
<TargetFrameworks>netstandard2.0;net6.0;net8.0</TargetFrameworks>
<GenerateDocumentationFile>true</GenerateDocumentationFile>
</PropertyGroup>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ private static void SetExecutionEnvironment()
envValue.Append($"{Environment.GetEnvironmentVariable(envName)}_");
}

envValue.Append("amazon-lambda-annotations_1.3.0.0");
envValue.Append("lib/amazon-lambda-annotations#1.3.1.0");

Environment.SetEnvironmentVariable(envName, envValue.ToString());
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ private static void SetExecutionEnvironment()
envValue.Append($"{Environment.GetEnvironmentVariable(envName)}_");
}

envValue.Append("amazon-lambda-annotations_1.3.0.0");
envValue.Append("lib/amazon-lambda-annotations#1.3.1.0");

Environment.SetEnvironmentVariable(envName, envValue.ToString());
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ private static void SetExecutionEnvironment()
envValue.Append($"{Environment.GetEnvironmentVariable(envName)}_");
}

envValue.Append("amazon-lambda-annotations_1.3.0.0");
envValue.Append("lib/amazon-lambda-annotations#1.3.1.0");

Environment.SetEnvironmentVariable(envName, envValue.ToString());
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ private static void SetExecutionEnvironment()
envValue.Append($"{Environment.GetEnvironmentVariable(envName)}_");
}

envValue.Append("amazon-lambda-annotations_1.3.0.0");
envValue.Append("lib/amazon-lambda-annotations#1.3.1.0");

Environment.SetEnvironmentVariable(envName, envValue.ToString());
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ private static void SetExecutionEnvironment()
envValue.Append($"{Environment.GetEnvironmentVariable(envName)}_");
}

envValue.Append("amazon-lambda-annotations_1.3.0.0");
envValue.Append("lib/amazon-lambda-annotations#1.3.1.0");

Environment.SetEnvironmentVariable(envName, envValue.ToString());
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ private static void SetExecutionEnvironment()
envValue.Append($"{Environment.GetEnvironmentVariable(envName)}_");
}

envValue.Append("amazon-lambda-annotations_1.3.0.0");
envValue.Append("lib/amazon-lambda-annotations#1.3.1.0");

Environment.SetEnvironmentVariable(envName, envValue.ToString());
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ private static void SetExecutionEnvironment()
envValue.Append($"{Environment.GetEnvironmentVariable(envName)}_");
}

envValue.Append("amazon-lambda-annotations_1.3.0.0");
envValue.Append("lib/amazon-lambda-annotations#1.3.1.0");

Environment.SetEnvironmentVariable(envName, envValue.ToString());
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ private static void SetExecutionEnvironment()
envValue.Append($"{Environment.GetEnvironmentVariable(envName)}_");
}

envValue.Append("amazon-lambda-annotations_1.3.0.0");
envValue.Append("lib/amazon-lambda-annotations#1.3.1.0");

Environment.SetEnvironmentVariable(envName, envValue.ToString());
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ private static void SetExecutionEnvironment()
envValue.Append($"{Environment.GetEnvironmentVariable(envName)}_");
}

envValue.Append("amazon-lambda-annotations_1.3.0.0");
envValue.Append("lib/amazon-lambda-annotations#1.3.1.0");

Environment.SetEnvironmentVariable(envName, envValue.ToString());
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ private static void SetExecutionEnvironment()
envValue.Append($"{Environment.GetEnvironmentVariable(envName)}_");
}

envValue.Append("amazon-lambda-annotations_1.3.0.0");
envValue.Append("lib/amazon-lambda-annotations#1.3.1.0");

Environment.SetEnvironmentVariable(envName, envValue.ToString());
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ private static void SetExecutionEnvironment()
envValue.Append($"{Environment.GetEnvironmentVariable(envName)}_");
}

envValue.Append("amazon-lambda-annotations_1.3.0.0");
envValue.Append("lib/amazon-lambda-annotations#1.3.1.0");

Environment.SetEnvironmentVariable(envName, envValue.ToString());
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ private static void SetExecutionEnvironment()
envValue.Append($"{Environment.GetEnvironmentVariable(envName)}_");
}

envValue.Append("amazon-lambda-annotations_1.3.0.0");
envValue.Append("lib/amazon-lambda-annotations#1.3.1.0");

Environment.SetEnvironmentVariable(envName, envValue.ToString());
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ private static void SetExecutionEnvironment()
envValue.Append($"{Environment.GetEnvironmentVariable(envName)}_");
}

envValue.Append("amazon-lambda-annotations_1.3.0.0");
envValue.Append("lib/amazon-lambda-annotations#1.3.1.0");

Environment.SetEnvironmentVariable(envName, envValue.ToString());
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ private static void SetExecutionEnvironment()
envValue.Append($"{Environment.GetEnvironmentVariable(envName)}_");
}

envValue.Append("amazon-lambda-annotations_1.3.0.0");
envValue.Append("lib/amazon-lambda-annotations#1.3.1.0");

Environment.SetEnvironmentVariable(envName, envValue.ToString());
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ private static void SetExecutionEnvironment()
envValue.Append($"{Environment.GetEnvironmentVariable(envName)}_");
}

envValue.Append("amazon-lambda-annotations_1.3.0.0");
envValue.Append("lib/amazon-lambda-annotations#1.3.1.0");

Environment.SetEnvironmentVariable(envName, envValue.ToString());
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ private static void SetExecutionEnvironment()
envValue.Append($"{Environment.GetEnvironmentVariable(envName)}_");
}

envValue.Append("amazon-lambda-annotations_1.3.0.0");
envValue.Append("lib/amazon-lambda-annotations#1.3.1.0");

Environment.SetEnvironmentVariable(envName, envValue.ToString());
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ private static void SetExecutionEnvironment()
envValue.Append($"{Environment.GetEnvironmentVariable(envName)}_");
}

envValue.Append("amazon-lambda-annotations_1.3.0.0");
envValue.Append("lib/amazon-lambda-annotations#1.3.1.0");

Environment.SetEnvironmentVariable(envName, envValue.ToString());
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ private static void SetExecutionEnvironment()
envValue.Append($"{Environment.GetEnvironmentVariable(envName)}_");
}

envValue.Append("amazon-lambda-annotations_1.3.0.0");
envValue.Append("lib/amazon-lambda-annotations#1.3.1.0");

Environment.SetEnvironmentVariable(envName, envValue.ToString());
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ private static void SetExecutionEnvironment()
envValue.Append($"{Environment.GetEnvironmentVariable(envName)}_");
}

envValue.Append("amazon-lambda-annotations_1.3.0.0");
envValue.Append("lib/amazon-lambda-annotations#1.3.1.0");

Environment.SetEnvironmentVariable(envName, envValue.ToString());
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ private static void SetExecutionEnvironment()
envValue.Append($"{Environment.GetEnvironmentVariable(envName)}_");
}

envValue.Append("amazon-lambda-annotations_1.3.0.0");
envValue.Append("lib/amazon-lambda-annotations#1.3.1.0");

Environment.SetEnvironmentVariable(envName, envValue.ToString());
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ private static void SetExecutionEnvironment()
envValue.Append($"{Environment.GetEnvironmentVariable(envName)}_");
}

envValue.Append("amazon-lambda-annotations_1.3.0.0");
envValue.Append("lib/amazon-lambda-annotations#1.3.1.0");

Environment.SetEnvironmentVariable(envName, envValue.ToString());
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ private static void SetExecutionEnvironment()
envValue.Append($"{Environment.GetEnvironmentVariable(envName)}_");
}

envValue.Append("amazon-lambda-annotations_1.3.0.0");
envValue.Append("lib/amazon-lambda-annotations#1.3.1.0");

Environment.SetEnvironmentVariable(envName, envValue.ToString());
}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"AWSTemplateFormatVersion": "2010-09-09",
"Transform": "AWS::Serverless-2016-10-31",
"Description": "This template is partially managed by Amazon.Lambda.Annotations (v1.3.0.0).",
"Description": "This template is partially managed by Amazon.Lambda.Annotations (v1.3.1.0).",
"Resources": {
"TestServerlessAppComplexCalculatorAddGenerated": {
"Type": "AWS::Serverless::Function",
Expand Down
Loading