Merge from main and fix build issues

Author: stocaaro

.changeset/bright-guests-marry.md

@@ -0,0 +1,11 @@
+---
+'@aws-amplify/backend-function': minor
+'@aws-amplify/backend-storage': patch
+'@aws-amplify/plugin-types': minor
+'@aws-amplify/backend': minor
+'@aws-amplify/backend-auth': patch
+'@aws-amplify/backend-data': patch
+'@aws-amplify/backend-ai': patch
+---
+
+add resourceGroupName prop to function

.changeset/ninety-trainers-flow.md

@@ -0,0 +1,2 @@
+---
+---

.changeset/pink-students-allow.md

@@ -0,0 +1,2 @@
+---
+---

package-lock.json

@@ -1,5 +1,6 @@
 import { AIConversationOutput } from '@aws-amplify/backend-output-schemas';
 import {
+  AmplifyResourceGroupName,
   BackendOutputStorageStrategy,
   ConstructContainerEntryGenerator,
   ConstructFactory,
@@ -20,7 +21,8 @@ import { AiModel } from '@aws-amplify/data-schema-types';
 class ConversationHandlerFunctionGenerator
   implements ConstructContainerEntryGenerator
 {
-  readonly resourceGroupName = 'conversationHandlerFunction';
+  readonly resourceGroupName: AmplifyResourceGroupName =
+    'conversationHandlerFunction';
 
   constructor(
     private readonly props: DefineConversationHandlerFunctionProps,

packages/backend-ai/src/conversation/factory.ts

@@ -12,6 +12,7 @@ import {
   TriggerEvent,
 } from '@aws-amplify/auth-construct';
 import {
+  AmplifyResourceGroupName,
   AuthResources,
   AuthRoleName,
   ConstructContainerEntryGenerator,
@@ -134,7 +135,7 @@ export class AmplifyAuthFactory implements ConstructFactory<BackendAuth> {
 }
 
 class AmplifyAuthGenerator implements ConstructContainerEntryGenerator {
-  readonly resourceGroupName = 'auth';
+  readonly resourceGroupName: AmplifyResourceGroupName = 'auth';
   private readonly name: string;
 
   constructor(

packages/backend-auth/src/factory.ts

@@ -1,4 +1,5 @@
 import {
+  AmplifyResourceGroupName,
   AuthRoleName,
   BackendOutputStorageStrategy,
   ConstructContainerEntryGenerator,
@@ -129,7 +130,7 @@ export class AmplifyReferenceAuthFactory
 class AmplifyReferenceAuthGenerator
   implements ConstructContainerEntryGenerator
 {
-  readonly resourceGroupName = 'auth';
+  readonly resourceGroupName: AmplifyResourceGroupName = 'auth';
   private readonly name: string;
 
   constructor(

packages/backend-auth/src/reference_factory.ts

@@ -19,7 +19,7 @@
   },
   "license": "Apache-2.0",
   "devDependencies": {
-    "@aws-amplify/data-schema": "^1.0.0",
+    "@aws-amplify/data-schema": "^1.13.4",
     "@aws-amplify/backend-platform-test-stubs": "^0.3.6",
     "@aws-amplify/platform-core": "^1.2.0"
   },

packages/backend-data/package.json

@@ -1,6 +1,7 @@
 import { IConstruct } from 'constructs';
 import {
   AmplifyFunction,
+  AmplifyResourceGroupName,
   AuthResources,
   BackendOutputStorageStrategy,
   ConstructContainerEntryGenerator,
@@ -117,7 +118,7 @@ export class DataFactory implements ConstructFactory<AmplifyData> {
 }
 
 class DataGenerator implements ConstructContainerEntryGenerator {
-  readonly resourceGroupName = 'data';
+  readonly resourceGroupName: AmplifyResourceGroupName = 'data';
   private readonly name: string;
 
   constructor(

packages/backend-data/src/factory.ts

@@ -4,6 +4,7 @@
 
 ```ts
 
+import { AmplifyResourceGroupName } from '@aws-amplify/plugin-types';
 import { BackendSecret } from '@aws-amplify/plugin-types';
 import { ConstructFactory } from '@aws-amplify/plugin-types';
 import { FunctionResources } from '@aws-amplify/plugin-types';
@@ -79,6 +80,7 @@ export type FunctionProps = {
     schedule?: FunctionSchedule | FunctionSchedule[];
     layers?: Record<string, string>;
     bundling?: FunctionBundlingOptions;
+    resourceGroupName?: AmplifyResourceGroupName;
 };
 
 // @public (undocumented)